From 28ba6ca835c5e1a8216eb2605029dfdc21b8ff24 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:01:06 +0200
Subject: [PATCH] Refs #21129: solve compilation error after rebase

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 examples/cpp/xtypes/SubscriberApp.cpp              |  2 +-
 examples/cpp/xtypes/SubscriberApp.hpp              |  2 +-
 test/blackbox/api/dds-pim/PubSubParticipant.hpp    | 10 +++++-----
 test/blackbox/common/DDSBlackboxTestsDiscovery.cpp |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/cpp/xtypes/SubscriberApp.cpp b/examples/cpp/xtypes/SubscriberApp.cpp
index 46335e5c449..7c1b1b0f050 100644
--- a/examples/cpp/xtypes/SubscriberApp.cpp
+++ b/examples/cpp/xtypes/SubscriberApp.cpp
@@ -189,7 +189,7 @@ void SubscriberApp::on_data_available(
 
 void SubscriberApp::on_data_writer_discovery(
         DomainParticipant* /*participant*/,
-        eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
+        eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
         bool& should_be_ignored)
 {
     // We don't want to ignore the writer
diff --git a/examples/cpp/xtypes/SubscriberApp.hpp b/examples/cpp/xtypes/SubscriberApp.hpp
index 951b94694ea..3b6be9b0480 100644
--- a/examples/cpp/xtypes/SubscriberApp.hpp
+++ b/examples/cpp/xtypes/SubscriberApp.hpp
@@ -60,7 +60,7 @@ class SubscriberApp : public Application, public DomainParticipantListener
 
     void on_data_writer_discovery(
             DomainParticipant* participant,
-            eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
+            eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
             bool& should_be_ignored) override;
 
     //! Run subscriber
diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
index 506c2ad722a..1b0eefe46aa 100644
--- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp
+++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -886,16 +886,16 @@ class PubSubParticipant
 
     PubSubParticipant& fill_server_qos(
             eprosima::fastdds::dds::WireProtocolConfigQos& qos,
-            eprosima::fastrtps::rtps::GuidPrefix_t& guid,
-            eprosima::fastrtps::rtps::Locator_t& locator_server,
+            eprosima::fastdds::rtps::GuidPrefix_t& guid,
+            eprosima::fastdds::rtps::Locator_t& locator_server,
             uint16_t port,
             uint32_t kind)
     {
-        qos.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol_t::SERVER;
+        qos.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
         qos.prefix = guid;
         // Generate server's listening locator
-        eprosima::fastrtps::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
-        eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(locator_server, port);
+        eprosima::fastdds::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
+        eprosima::fastdds::rtps::IPLocator::setPhysicalPort(locator_server, port);
         locator_server.kind = kind;
         // Leave logical port as 0 to use TCP DS default logical port
         qos.builtin.metatrafficUnicastLocatorList.push_back(locator_server);
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
index e264971385b..50c1018165f 100644
--- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -320,7 +320,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
 {
     using namespace eprosima;
     using namespace eprosima::fastdds::dds;
-    using namespace eprosima::fastrtps::rtps;
+    using namespace eprosima::fastdds::rtps;
 
     // TCP default DS port
     constexpr uint16_t W_UNICAST_PORT_RANDOM_NUMBER_STR = 41100;
@@ -334,7 +334,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
     GuidPrefix_t server_1_prefix;
     for (auto i = 0; i < 12; i++)
     {
-        server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254);
+        server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254);
     }
     Locator_t locator_server_1;
     uint16_t server_1_port = W_UNICAST_PORT_RANDOM_NUMBER_STR;