Adjust for const changes in DataWriter APIs (#817)

EduPonz · web-flow · commit de12490ea741 · 2024-06-21T12:58:13.000+02:00
Signed-off-by: eduponz &lt;eduardoponz@eprosima.com&gt;
diff --git 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<uint32_t()> 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
@@ -1525,7 +1525,7 @@ class CustomDataType : public TopicDataType
     }
 
     bool serialize(
-            void* data,
+            const void* const data,
             eprosima::fastdds::rtps::SerializedPayload_t* payload) override
     {
         return true;
@@ -1539,7 +1539,7 @@ class CustomDataType : public TopicDataType
     }
 
     std::function<uint32_t()> getSerializedSizeProvider(
-            void* data) override
+            const void* const data) override
     {
         return std::function<uint32_t()>();
     }
@@ -1555,7 +1555,7 @@ class CustomDataType : public TopicDataType
     }
 
     bool getKey(
-            void* data,
+            const void* const data,
             eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
             bool force_md5) override
     {
@@ -6921,7 +6921,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;
@@ -6935,7 +6935,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     std::function<uint32_t()> getSerializedSizeProvider(
-            void* data) override
+            const void* const data) override
     {
         return std::function<uint32_t()>();
     }
@@ -6951,7 +6951,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
@@ -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<HelloWorld*>(data);
+    const HelloWorld* p_type = static_cast<const HelloWorld*>(data);
 
     // Object that manages the raw buffer.
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(payload->data), payload->max_size);
@@ -133,7 +133,7 @@ bool HelloWorldPubSubType::deserialize(
 }
 
 std::function<uint32_t()> HelloWorldPubSubType::getSerializedSizeProvider(
-        void* data,
+        const void* const data,
         DataRepresentationId_t data_representation)
 {
     return [data, data_representation]() -> uint32_t
@@ -150,7 +150,7 @@ std::function<uint32_t()> HelloWorldPubSubType::getSerializedSizeProvider(
                        eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2);
                    size_t current_alignment {0};
                    return static_cast<uint32_t>(calculator.calculate_serialized_size(
-                               *static_cast<HelloWorld*>(data), current_alignment)) +
+                               *static_cast<const HelloWorld*>(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<HelloWorld*>(data);
+    const HelloWorld* p_type = static_cast<const HelloWorld*>(data);
 
     // Object that manages the raw buffer.
     eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(m_keyBuffer),
diff --git 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<uint32_t()> getSerializedSizeProvider(
-            void* data) override
+            const void* const data) override
     {
         return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
     }
 
     eProsima_user_DllExport std::function<uint32_t()> 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;
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class HelloWorld`
`36`	`36`	`class HelloWorldPubSubType : public TopicDataType`
`37`	`37`	`{`
`38`	`38`	`bool serialize(`
`39`		`- void* data,`
	`39`	`+ const void* const data,`
`40`	`40`	`rtps::SerializedPayload_t* payload) override`
`41`	`41`	`{`
`42`	`42`	`return false;`
`@@ -50,7 +50,7 @@ class HelloWorldPubSubType : public TopicDataType`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`std::function<uint32_t()> getSerializedSizeProvider(`
`53`		`- void* data) override`
	`53`	`+ const void* const data) override`
`54`	`54`	`{`
`55`	`55`	`return []`
`56`	`56`	`{`
`@@ -69,7 +69,7 @@ class HelloWorldPubSubType : public TopicDataType`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`bool getKey(`
`72`		`- void* data,`
	`72`	`+ const void* const data,`
`73`	`73`	`rtps::InstanceHandle_t* ihandle,`
`74`	`74`	`bool force_md5 = false) override`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1525,7 +1525,7 @@ class CustomDataType : public TopicDataType`
`1525`	`1525`	`}`
`1526`	`1526`
`1527`	`1527`	`bool serialize(`
`1528`		`- void* data,`
	`1528`	`+ const void* const data,`
`1529`	`1529`	`eprosima::fastdds::rtps::SerializedPayload_t* payload) override`
`1530`	`1530`	`{`
`1531`	`1531`	`return true;`
`@@ -1539,7 +1539,7 @@ class CustomDataType : public TopicDataType`
`1539`	`1539`	`}`
`1540`	`1540`
`1541`	`1541`	`std::function<uint32_t()> getSerializedSizeProvider(`
`1542`		`- void* data) override`
	`1542`	`+ const void* const data) override`
`1543`	`1543`	`{`
`1544`	`1544`	`return std::function<uint32_t()>();`
`1545`	`1545`	`}`
`@@ -1555,7 +1555,7 @@ class CustomDataType : public TopicDataType`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`	`1557`	`bool getKey(`
`1558`		`- void* data,`
	`1558`	`+ const void* const data,`
`1559`	`1559`	`eprosima::fastdds::rtps::InstanceHandle_t* ihandle,`
`1560`	`1560`	`bool force_md5) override`
`1561`	`1561`	`{`
`@@ -6921,7 +6921,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp`
`6921`	`6921`	`}`
`6922`	`6922`
`6923`	`6923`	`bool serialize(`
`6924`		`- void* data,`
	`6924`	`+ const void* const data,`
`6925`	`6925`	`eprosima::fastdds::rtps::SerializedPayload_t* payload) override`
`6926`	`6926`	`{`
`6927`	`6927`	`return true;`
`@@ -6935,7 +6935,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp`
`6935`	`6935`	`}`
`6936`	`6936`
`6937`	`6937`	`std::function<uint32_t()> getSerializedSizeProvider(`
`6938`		`- void* data) override`
	`6938`	`+ const void* const data) override`
`6939`	`6939`	`{`
`6940`	`6940`	`return std::function<uint32_t()>();`
`6941`	`6941`	`}`
`@@ -6951,7 +6951,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp`
`6951`	`6951`	`}`
`6952`	`6952`
`6953`	`6953`	`bool getKey(`
`6954`		`- void* data,`
	`6954`	`+ const void* const data,`
`6955`	`6955`	`eprosima::fastdds::rtps::InstanceHandle_t* ihandle,`
`6956`	`6956`	`bool force_md5) override`
`6957`	`6957`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ HelloWorldPubSubType::~HelloWorldPubSubType()`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`bool HelloWorldPubSubType::serialize(`
`60`		`- void* data,`
	`60`	`+ const void* const data,`
`61`	`61`	`SerializedPayload_t* payload,`
`62`	`62`	`DataRepresentationId_t data_representation)`
`63`	`63`	`{`
`64`		`- HelloWorld* p_type = static_cast<HelloWorld*>(data);`
	`64`	`+ const HelloWorld* p_type = static_cast<const HelloWorld*>(data);`
`65`	`65`
`66`	`66`	`// Object that manages the raw buffer.`
`67`	`67`	`eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(payload->data), payload->max_size);`
`@@ -133,7 +133,7 @@ bool HelloWorldPubSubType::deserialize(`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`std::function<uint32_t()> HelloWorldPubSubType::getSerializedSizeProvider(`
`136`		`- void* data,`
	`136`	`+ const void* const data,`
`137`	`137`	`DataRepresentationId_t data_representation)`
`138`	`138`	`{`
`139`	`139`	`return [data, data_representation]() -> uint32_t`
`@@ -150,7 +150,7 @@ std::function<uint32_t()> HelloWorldPubSubType::getSerializedSizeProvider(`
`150`	`150`	`eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2);`
`151`	`151`	`size_t current_alignment {0};`
`152`	`152`	`return static_cast<uint32_t>(calculator.calculate_serialized_size(`
`153`		`- static_cast<HelloWorld>(data), current_alignment)) +`
	`153`	`+ static_cast<const HelloWorld>(data), current_alignment)) +`
`154`	`154`	`4u /encapsulation/;`
`155`	`155`	`}`
`156`	`156`	`catch (eprosima::fastcdr::exception::Exception& /exception/)`
`@@ -173,7 +173,7 @@ void HelloWorldPubSubType::deleteData(`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`bool HelloWorldPubSubType::getKey(`
`176`		`- void* data,`
	`176`	`+ const void* const data,`
`177`	`177`	`InstanceHandle_t* handle,`
`178`	`178`	`bool force_md5)`
`179`	`179`	`{`
`@@ -182,7 +182,7 @@ bool HelloWorldPubSubType::getKey(`
`182`	`182`	`return false;`
`183`	`183`	`}`
`184`	`184`
`185`		`- HelloWorld* p_type = static_cast<HelloWorld*>(data);`
	`185`	`+ const HelloWorld* p_type = static_cast<const HelloWorld*>(data);`
`186`	`186`
`187`	`187`	`// Object that manages the raw buffer.`
`188`	`188`	`eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char*>(m_keyBuffer),`