Refs #21129: Fix compilation error

elianalf · elianalf · commit 0a903a0c0e47 · 2024-06-14T11:15:45.000+02:00
Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;
diff --git a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
@@ -26,15 +26,15 @@
 #include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
 
-class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
+class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
 {
 public:
 
     ~CustomPayloadPool() = default;
 
     bool get_payload(
             unsigned int size,
-            eprosima::fastrtps::rtps::SerializedPayload_t& payload)
+            eprosima::fastdds::rtps::SerializedPayload_t& payload)
     {
         // Reserve new memory for the payload buffer
         unsigned char* payload_buff = new unsigned char[size];
@@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
     }
 
     bool get_payload(
-            const eprosima::fastrtps::rtps::SerializedPayload_t& data,
-            eprosima::fastrtps::rtps::SerializedPayload_t& payload)
+            const eprosima::fastdds::rtps::SerializedPayload_t& data,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload)
     {
         // Reserve new memory for the payload buffer
         unsigned char* payload_buff = new unsigned char[data.length];
@@ -72,7 +72,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
     }
 
     bool release_payload(
-            eprosima::fastrtps::rtps::SerializedPayload_t& payload)
+            eprosima::fastdds::rtps::SerializedPayload_t& payload)
     {
         // Ensure precondition
         if (this != payload.payload_owner)
diff --git a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
@@ -436,23 +436,23 @@ inline bool ParameterSerializer<ParameterVendorId_t>::read_content_from_cdr_mess
 template<>
 inline bool ParameterSerializer<ParameterDomainId_t>::add_content_to_cdr_message(
         const ParameterDomainId_t& parameter,
-        fastrtps::rtps::CDRMessage_t* cdr_message)
+        fastdds::rtps::CDRMessage_t* cdr_message)
 {
-    return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id);
+    return fastdds::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id);
 }
 
 template<>
 inline bool ParameterSerializer<ParameterDomainId_t>::read_content_from_cdr_message(
         ParameterDomainId_t& parameter,
-        fastrtps::rtps::CDRMessage_t* cdr_message,
+        fastdds::rtps::CDRMessage_t* cdr_message,
         const uint16_t parameter_length)
 {
     if (parameter_length != PARAMETER_DOMAINID_LENGTH)
     {
         return false;
     }
     parameter.length = parameter_length;
-    return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &parameter.domain_id);
+    return fastdds::rtps::CDRMessage::readUInt32(cdr_message, &parameter.domain_id);
 }
 
 template<>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
@@ -38,7 +38,7 @@
 using ParameterList = eprosima::fastdds::dds::ParameterList;
 
 namespace eprosima {
-namespace fastrtps {
+namespace fastdds {
 namespace rtps {
 
 PDPClientListener::PDPClientListener(
@@ -59,5 +59,5 @@ bool PDPClientListener::check_discovery_conditions(
 }
 
 } /* namespace rtps */
-} /* namespace fastrtps */
+} /* namespace fastdds */
 } /* namespace eprosima */
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp
@@ -23,7 +23,7 @@
 #include <rtps/builtin/discovery/participant/PDPListener.h>
 
 namespace eprosima {
-namespace fastrtps {
+namespace fastdds {
 namespace rtps {
 
 /**
@@ -53,7 +53,7 @@ class PDPClientListener : public PDPListener
 
 
 } /* namespace rtps */
-} /* namespace fastrtps */
+} /* namespace fastdds */
 } /* namespace eprosima */
 
 #endif /* _FASTDDS_RTPS_PDPCLIENTLISTENER_H_ */
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
@@ -369,7 +369,7 @@ std::pair<bool, bool> PDPServerListener::check_server_discovery_conditions(
     std::pair<bool, bool> ret{true, true};
 
     /* Check PID_VENDOR_ID */
-    if (participant_data.m_VendorId != fastrtps::rtps::c_VendorId_eProsima)
+    if (participant_data.m_VendorId != fastdds::rtps::c_VendorId_eProsima)
     {
         EPROSIMA_LOG_INFO(RTPS_PDP_LISTENER,
                 "DATA(p|Up) from different vendor is not supported for Discover-Server operation");
diff --git a/src/cpp/rtps/common/SerializedPayload.cpp b/src/cpp/rtps/common/SerializedPayload.cpp
@@ -19,7 +19,7 @@
 #include <fastdds/rtps/common/SerializedPayload.h>
 
 namespace eprosima {
-namespace fastrtps {
+namespace fastdds {
 namespace rtps {
 
 SerializedPayload_t& SerializedPayload_t::operator = (
@@ -144,5 +144,5 @@ void SerializedPayload_t::reserve(
 }
 
 } /* namespace rtps */
-} /* namespace fastrtps */
+} /* namespace fastdds */
 } /* namespace eprosima */
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
@@ -113,10 +113,10 @@ class RTPSMessageGroup_t
 #endif // if HAVE_SECURITY
 
     //! Vector to store the NetworkBuffers that will be used to form the RTPS message.
-    eprosima::fastrtps::ResourceLimitedVector<eprosima::fastdds::rtps::NetworkBuffer> buffers_;
+    eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::NetworkBuffer> buffers_;
 
     //! Mirror vector of buffers_ to store the serialized payloads.
-    eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::SerializedPayload_t> payloads_;
+    eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::SerializedPayload_t> payloads_;
 };
 
 } // namespace rtps
diff --git a/src/cpp/rtps/reader/BaseReader.cpp b/src/cpp/rtps/reader/BaseReader.cpp
@@ -282,7 +282,7 @@ void BaseReader::release_cache(
 {
     std::lock_guard<decltype(mp_mutex)> guard(mp_mutex);
 
-    fastrtps::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner;
+    fastdds::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner;
     if (pool)
     {
         pool->release_payload(change->serializedPayload);
diff --git a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
@@ -204,8 +204,8 @@ inline void set_statistics_submessage_from_transport(
 
         // Set current timestamp and sequence
         auto current_pos = &static_cast<const octet*>(send_buffer.buffer)[statistics_pos];
-        Time_t ts;
-        Time_t::now(ts);
+        eprosima::fastdds::rtps::Time_t ts;
+        eprosima::fastdds::rtps::Time_t::now(ts);
 
         /*
          * This set of memcpy blocks is intended to prevent an undefined behavior caused when casting from an octet* to a StatisticsSubmessageData*
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -1938,7 +1938,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco
 {
     using namespace eprosima::fastdds::dds;
     using namespace eprosima::fastdds::rtps;
-    using namespace eprosima::fastrtps::rtps;
+    using namespace eprosima::fastdds::rtps;
 
     PubSubReader<HelloWorldPubSubType> reader(TEST_TOPIC_NAME);
     PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
@@ -1963,8 +1963,8 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco
                     uint16_t plength = 0;
                     bool valid = true;
 
-                    valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid);
-                    valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength);
+                    valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid);
+                    valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &plength);
 
                     if (pid == eprosima::fastdds::dds::PID_SENTINEL)
                     {
@@ -1987,7 +1987,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco
                         if (pid == eprosima::fastdds::dds::PID_DOMAIN_ID)
                         {
                             uint32_t domain_id = 0;
-                            eprosima::fastrtps::rtps::CDRMessage::readUInt32(&msg, &domain_id);
+                            eprosima::fastdds::rtps::CDRMessage::readUInt32(&msg, &domain_id);
                             if (domain_id == (uint32_t)GET_PID() % 230)
                             {
                                 pid_was_found = true;
diff --git a/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp b/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp
@@ -32,7 +32,7 @@
 
 namespace eprosima {
 
-namespace fastrtps {
+namespace fastdds {
 namespace rtps {
 
 struct CacheChange_t;
@@ -44,7 +44,7 @@ class WriterProxy;
 class WriterProxyData;
 
 } // namespace rtps
-} // namespace fastrtps
+} // namespace fastdds
 
 namespace fastdds {
 namespace rtps {
diff --git a/versions.md b/versions.md
@@ -325,9 +325,9 @@ This release has the following **API breaks**:
 
 Users should also be aware of the following **deprecation announcement**:
 
-* All classes inside the namespace `eprosima::fastrtps` should be considered deprecated.
+* All classes inside the namespace `eprosima::fastdds` should be considered deprecated.
   Equivalent functionality is offered through namespace `eprosima::fastdds`.
-* Namespaces beneath `eprosima::fastrtps` are not included in this deprecation, i.e.
+* Namespaces beneath `eprosima::fastdds` are not included in this deprecation, i.e.
   `eprosima::fastdds::rtps` can still be used)
 
 This release adds the following **features**:

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@`
`26`	`26`	`#include <fastdds/rtps/history/IPayloadPool.h>`
`27`	`27`	`#include <fastdds/rtps/common/SerializedPayload.h>`
`28`	`28`
`29`		`-class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool`
	`29`	`+class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`	`32`
`33`	`33`	`~CustomPayloadPool() = default;`
`34`	`34`
`35`	`35`	`bool get_payload(`
`36`	`36`	`unsigned int size,`
`37`		`- eprosima::fastrtps::rtps::SerializedPayload_t& payload)`
	`37`	`+ eprosima::fastdds::rtps::SerializedPayload_t& payload)`
`38`	`38`	`{`
`39`	`39`	`// Reserve new memory for the payload buffer`
`40`	`40`	`unsigned char* payload_buff = new unsigned char[size];`
`@@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`bool get_payload(`
`54`		`- const eprosima::fastrtps::rtps::SerializedPayload_t& data,`
`55`		`- eprosima::fastrtps::rtps::SerializedPayload_t& payload)`
	`54`	`+ const eprosima::fastdds::rtps::SerializedPayload_t& data,`
	`55`	`+ eprosima::fastdds::rtps::SerializedPayload_t& payload)`
`56`	`56`	`{`
`57`	`57`	`// Reserve new memory for the payload buffer`
`58`	`58`	`unsigned char* payload_buff = new unsigned char[data.length];`
`@@ -72,7 +72,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`bool release_payload(`
`75`		`- eprosima::fastrtps::rtps::SerializedPayload_t& payload)`
	`75`	`+ eprosima::fastdds::rtps::SerializedPayload_t& payload)`
`76`	`76`	`{`
`77`	`77`	`// Ensure precondition`
`78`	`78`	`if (this != payload.payload_owner)`
Original file line number	Diff line number	Diff line change
`@@ -436,23 +436,23 @@ inline bool ParameterSerializer<ParameterVendorId_t>::read_content_from_cdr_mess`
`436`	`436`	`template<>`
`437`	`437`	`inline bool ParameterSerializer<ParameterDomainId_t>::add_content_to_cdr_message(`
`438`	`438`	`const ParameterDomainId_t& parameter,`
`439`		`- fastrtps::rtps::CDRMessage_t* cdr_message)`
	`439`	`+ fastdds::rtps::CDRMessage_t* cdr_message)`
`440`	`440`	`{`
`441`		`- return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id);`
	`441`	`+ return fastdds::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id);`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`template<>`
`445`	`445`	`inline bool ParameterSerializer<ParameterDomainId_t>::read_content_from_cdr_message(`
`446`	`446`	`ParameterDomainId_t& parameter,`
`447`		`- fastrtps::rtps::CDRMessage_t* cdr_message,`
	`447`	`+ fastdds::rtps::CDRMessage_t* cdr_message,`
`448`	`448`	`const uint16_t parameter_length)`
`449`	`449`	`{`
`450`	`450`	`if (parameter_length != PARAMETER_DOMAINID_LENGTH)`
`451`	`451`	`{`
`452`	`452`	`return false;`
`453`	`453`	`}`
`454`	`454`	`parameter.length = parameter_length;`
`455`		`- return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &parameter.domain_id);`
	`455`	`+ return fastdds::rtps::CDRMessage::readUInt32(cdr_message, &parameter.domain_id);`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`template<>`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ std::pair<bool, bool> PDPServerListener::check_server_discovery_conditions(`
`369`	`369`	`std::pair<bool, bool> ret{true, true};`
`370`	`370`
`371`	`371`	`/* Check PID_VENDOR_ID */`
`372`		`- if (participant_data.m_VendorId != fastrtps::rtps::c_VendorId_eProsima)`
	`372`	`+ if (participant_data.m_VendorId != fastdds::rtps::c_VendorId_eProsima)`
`373`	`373`	`{`
`374`	`374`	`EPROSIMA_LOG_INFO(RTPS_PDP_LISTENER,`
`375`	`375`	`"DATA(p\|Up) from different vendor is not supported for Discover-Server operation");`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ void BaseReader::release_cache(`
`282`	`282`	`{`
`283`	`283`	`std::lock_guard<decltype(mp_mutex)> guard(mp_mutex);`
`284`	`284`
`285`		`- fastrtps::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner;`
	`285`	`+ fastdds::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner;`
`286`	`286`	`if (pool)`
`287`	`287`	`{`
`288`	`288`	`pool->release_payload(change->serializedPayload);`
Original file line number	Diff line number	Diff line change
`@@ -1938,7 +1938,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco`
`1938`	`1938`	`{`
`1939`	`1939`	`using namespace eprosima::fastdds::dds;`
`1940`	`1940`	`using namespace eprosima::fastdds::rtps;`
`1941`		`- using namespace eprosima::fastrtps::rtps;`
	`1941`	`+ using namespace eprosima::fastdds::rtps;`
`1942`	`1942`
`1943`	`1943`	`PubSubReader<HelloWorldPubSubType> reader(TEST_TOPIC_NAME);`
`1944`	`1944`	`PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);`
`@@ -1963,8 +1963,8 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco`
`1963`	`1963`	`uint16_t plength = 0;`
`1964`	`1964`	`bool valid = true;`
`1965`	`1965`
`1966`		`- valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid);`
`1967`		`- valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength);`
	`1966`	`+ valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid);`
	`1967`	`+ valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &plength);`
`1968`	`1968`
`1969`	`1969`	`if (pid == eprosima::fastdds::dds::PID_SENTINEL)`
`1970`	`1970`	`{`
`@@ -1987,7 +1987,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco`
`1987`	`1987`	`if (pid == eprosima::fastdds::dds::PID_DOMAIN_ID)`
`1988`	`1988`	`{`
`1989`	`1989`	`uint32_t domain_id = 0;`
`1990`		`- eprosima::fastrtps::rtps::CDRMessage::readUInt32(&msg, &domain_id);`
	`1990`	`+ eprosima::fastdds::rtps::CDRMessage::readUInt32(&msg, &domain_id);`
`1991`	`1991`	`if (domain_id == (uint32_t)GET_PID() % 230)`
`1992`	`1992`	`{`
`1993`	`1993`	`pid_was_found = true;`