Refs #20709: Make private CDRMessage.h and move CDRMessage.hpp to CDR…

…Message.cpp Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Apr 4, 2024 · 635968e · 635968e
1 parent 287aa76
commit 635968e
Show file tree

Hide file tree

Showing 30 changed files with 95 additions and 141 deletions.
diff --git a/include/fastdds/dds/core/policy/ParameterTypes.hpp b/include/fastdds/dds/core/policy/ParameterTypes.hpp
@@ -28,7 +28,7 @@
 
 #include <fastdds/rtps/common/all_common.h>
 #include <fastdds/rtps/common/Token.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
+#include <fastdds/rtps/common/CDRMessage_t.h>
 
 #if HAVE_SECURITY
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>

diff --git a/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp b/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 
 #include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
+#include <fastdds/rtps/common/CDRMessage_t.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
@@ -16,10 +16,11 @@
 #define _FASTDDS_TEST_UDPV4_TRANSPORT_DESCRIPTOR_
 
 #include <functional>
+#include <atomic>
 
 #include <fastdds/rtps/transport/SocketTransportDescriptor.h>
 #include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
+#include <fastdds/rtps/common/CDRMessage_t.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/include/fastrtps/rtps/common/CDRMessage_t.h b/include/fastrtps/rtps/common/CDRMessage_t.h
diff --git a/include/fastrtps/rtps/messages/CDRMessage.h b/include/fastrtps/rtps/messages/CDRMessage.h
diff --git a/src/cpp/fastdds/core/policy/ParameterList.hpp b/src/cpp/fastdds/core/policy/ParameterList.hpp
@@ -23,8 +23,8 @@
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
 #include <fastdds/rtps/messages/RTPS_messages.h>
 #include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
 #include <fastdds/rtps/common/CacheChange.h>
+#include <rtps/messages/CDRMessage.h>
 
 #include <functional>
 

diff --git a/src/cpp/fastdds/topic/ContentFilterInfo.hpp b/src/cpp/fastdds/topic/ContentFilterInfo.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
+#include <rtps/messages/CDRMessage.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
@@ -24,13 +24,12 @@
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/rtps/messages/CDRMessage.h>
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/topic/ContentFilterUtils.hpp>
 #include <fastdds/topic/TopicProxy.hpp>
 #include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypesBase.h>
-
+#include <rtps/messages/CDRMessage.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp
@@ -32,12 +32,12 @@
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/messages/CDRMessage.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/builtin/liveliness/WLP.h>
+#include <rtps/messages/CDRMessage.h>
 #include <rtps/writer/LivelinessManager.hpp>
 
 namespace eprosima {

diff --git a/include/fastdds/rtps/messages/CDRMessage.hpp → src/cpp/rtps/messages/CDRMessage.cpp b/include/fastdds/rtps/messages/CDRMessage.hpp → src/cpp/rtps/messages/CDRMessage.cpp
@@ -15,10 +15,12 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 /**
- * @file CDRMessage.hpp
+ * @file CDRMessage.cpp
  *
  */
 
+#include "CDRMessage.h"
+
 #include <cassert>
 #include <cstring>
 #include <algorithm>