From d81315775454d97e829650047f9861b781198580 Mon Sep 17 00:00:00 2001 From: eduponz Date: Tue, 18 Jun 2024 09:06:17 +0200 Subject: [PATCH] Refs #21183: Adjust for const changes in DataWriter APIs Signed-off-by: eduponz --- code/CodeTester.cpp | 6 +++--- code/DDSCodeTester.cpp | 12 ++++++------ .../C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx | 12 ++++++------ .../C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp index fc357280d..c591bfc14 100644 --- a/code/CodeTester.cpp +++ b/code/CodeTester.cpp @@ -36,7 +36,7 @@ class HelloWorld class HelloWorldPubSubType : public TopicDataType { bool serialize( - void* data, + const void* const data, rtps::SerializedPayload_t* payload) override { return false; @@ -50,7 +50,7 @@ class HelloWorldPubSubType : public TopicDataType } std::function getSerializedSizeProvider( - void* data) override + const void* const data) override { return [] { @@ -69,7 +69,7 @@ class HelloWorldPubSubType : public TopicDataType } bool getKey( - void* data, + const void* const data, rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override { diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp index 8b7384e03..f51f247e5 100644 --- a/code/DDSCodeTester.cpp +++ b/code/DDSCodeTester.cpp @@ -1524,7 +1524,7 @@ class CustomDataType : public TopicDataType } bool serialize( - void* data, + const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return true; @@ -1538,7 +1538,7 @@ class CustomDataType : public TopicDataType } std::function getSerializedSizeProvider( - void* data) override + const void* const data) override { return std::function(); } @@ -1554,7 +1554,7 @@ class CustomDataType : public TopicDataType } bool getKey( - void* data, + const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5) override { @@ -6914,7 +6914,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp } bool serialize( - void* data, + const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return true; @@ -6928,7 +6928,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp } std::function getSerializedSizeProvider( - void* data) override + const void* const data) override { return std::function(); } @@ -6944,7 +6944,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp } bool getKey( - void* data, + const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5) override { diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx index a73cf0ffa..41da39407 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx @@ -57,11 +57,11 @@ HelloWorldPubSubType::~HelloWorldPubSubType() } bool HelloWorldPubSubType::serialize( - void* data, + const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - HelloWorld* p_type = static_cast(data); + const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -133,7 +133,7 @@ bool HelloWorldPubSubType::deserialize( } std::function HelloWorldPubSubType::getSerializedSizeProvider( - void* data, + const void* const data, DataRepresentationId_t data_representation) { return [data, data_representation]() -> uint32_t @@ -150,7 +150,7 @@ std::function HelloWorldPubSubType::getSerializedSizeProvider( eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + + *static_cast(data), current_alignment)) + 4u /*encapsulation*/; } catch (eprosima::fastcdr::exception::Exception& /*exception*/) @@ -173,7 +173,7 @@ void HelloWorldPubSubType::deleteData( } bool HelloWorldPubSubType::getKey( - void* data, + const void* const data, InstanceHandle_t* handle, bool force_md5) { @@ -182,7 +182,7 @@ bool HelloWorldPubSubType::getKey( return false; } - HelloWorld* p_type = static_cast(data); + const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h index f048c9be2..3db9ca964 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h @@ -53,14 +53,14 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; eProsima_user_DllExport bool serialize( - void* data, + const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( - void* data, + const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -69,17 +69,17 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data) override + const void* const data) override { return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport std::function getSerializedSizeProvider( - void* data, + const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool getKey( - void* data, + const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override;