Refs #20821: Apply suggestions: Make persistenteWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · May 30, 2024 · 382220e · 382220e
1 parent fd6292d
commit 382220e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
@@ -23,7 +23,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 
-
 #include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
 #include <rtps/writer/StatefulWriter.hpp>

diff --git a/src/cpp/rtps/writer/PersistentWriter.cpp b/src/cpp/rtps/writer/PersistentWriter.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/PersistentWriter.h>
+#include <rtps/writer/PersistentWriter.hpp>
 
 #include <fastdds/rtps/history/WriterHistory.h>
 

diff --git a/...de/fastdds/rtps/writer/PersistentWriter.h → src/cpp/rtps/writer/PersistentWriter.hpp b/...de/fastdds/rtps/writer/PersistentWriter.h → src/cpp/rtps/writer/PersistentWriter.hpp
@@ -13,14 +13,16 @@
 // limitations under the License.
 
 /**
- * @file PersistentWriter.h
+ * @file PersistentWriter.hpp
  */
-#ifndef _FASTDDS_RTPS_PERSISTENTWRITER_H_
-#define _FASTDDS_RTPS_PERSISTENTWRITER_H_
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#ifndef RTPS_WRITER__PERSISTENTWRITER_HPP
+#define RTPS_WRITER__PERSISTENTWRITER_HPP
+
 #include <string>
 
+#include <fastdds/rtps/writer/RTPSWriter.h>
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 namespace eprosima {
@@ -77,4 +79,4 @@ class PersistentWriter
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_PERSISTENTWRITER_H_ */
+#endif /* RTPS_WRITER__PERSISTENTWRITER_HPP */
diff --git a/src/cpp/rtps/writer/StatefulPersistentWriter.hpp b/src/cpp/rtps/writer/StatefulPersistentWriter.hpp
@@ -20,9 +20,7 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-
-#include <fastdds/rtps/writer/PersistentWriter.h>
-
+#include <rtps/writer/PersistentWriter.hpp>
 #include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {

diff --git a/src/cpp/rtps/writer/StatelessPersistentWriter.hpp b/src/cpp/rtps/writer/StatelessPersistentWriter.hpp
@@ -20,8 +20,7 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/writer/PersistentWriter.h>
-
+#include <rtps/writer/PersistentWriter.hpp>
 #include <rtps/writer/StatelessWriter.hpp>
 
 namespace eprosima {

diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp
@@ -37,11 +37,9 @@
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/publisher/DataWriterImpl.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
 
 #include "../../common/CustomPayloadPool.hpp"
 #include "../../logging/mock/MockConsumer.h"
-#include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {