From 404d68605805efa7a350d3da01b67e8e798453f7 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Tue, 16 Jul 2024 11:00:52 +0200
Subject: [PATCH] Refs #20181: Move FakeWriter.hpp to parent scope

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .../participant/{DS => }/FakeWriter.hpp          | 16 ++++++++--------
 .../builtin/discovery/participant/PDPServer.cpp  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename src/cpp/rtps/builtin/discovery/participant/{DS => }/FakeWriter.hpp (68%)

diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp b/src/cpp/rtps/builtin/discovery/participant/FakeWriter.hpp
similarity index 68%
rename from src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp
rename to src/cpp/rtps/builtin/discovery/participant/FakeWriter.hpp
index f0f2d444000..c203908c89d 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/FakeWriter.hpp
@@ -16,8 +16,8 @@
  * @file FakeWriter.hpp
  */
 
-#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_DS__FAKEWRITER_HPP_
-#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_DS__FAKEWRITER_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__FAKEWRITER_HPP_
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__FAKEWRITER_HPP_
 
 #include <fastdds/rtps/Endpoint.hpp>
 
@@ -30,16 +30,16 @@ namespace rtps {
 /**
  * An RTPS writer simulator used to send messages with a \ref DirectMessageSender.
  */
-class FakeWriter : public Endpoint
+class FakeWriter : public fastdds::rtps::Endpoint
 {
 public:
 
     FakeWriter(
-            RTPSParticipantImpl* participant,
-            const EntityId_t& entity_id)
-        : Endpoint(participant, { participant->getGuid().guidPrefix, entity_id }, {})
+            fastdds::rtps::RTPSParticipantImpl* participant,
+            const fastdds::rtps::EntityId_t& entity_id)
+        : fastdds::rtps::Endpoint(participant, { participant->getGuid().guidPrefix, entity_id }, {})
     {
-        m_att.endpointKind = EndpointKind_t::WRITER;
+        m_att.endpointKind = fastdds::rtps::EndpointKind_t::WRITER;
 #if HAVE_SECURITY
         participant->set_endpoint_rtps_protection_supports(this, false);
 #endif // HAVE_SECURITY
@@ -52,4 +52,4 @@ class FakeWriter : public Endpoint
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_DS__FAKEWRITER_HPP_ */
+#endif /* FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__FAKEWRITER_HPP_ */
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
index 69bb2cb53bb..2177ab6da57 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -38,8 +38,8 @@
 #include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
-#include <rtps/builtin/discovery/participant/DS/FakeWriter.hpp>
 #include <rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp>
+#include <rtps/builtin/discovery/participant/FakeWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
 #include <rtps/builtin/discovery/participant/PDPServerListener.hpp>
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>