From dcf32378ae4a9538b5779094bc6ffc1b0452fc93 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:12 +0100
Subject: [PATCH 1/3] Refs #20566: Migrate classes IPLocator and md5 from
 include/fastrtps to fastdds

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 code/CodeTester.cpp                                         | 2 +-
 code/DDSCodeTester.cpp                                      | 2 +-
 code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp
index dbb3be40f..c59e430d5 100644
--- a/code/CodeTester.cpp
+++ b/code/CodeTester.cpp
@@ -7,13 +7,13 @@
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/log/Log.h>
 #include <fastrtps/log/FileConsumer.h>
 #include <fastrtps/TopicDataType.h>
 #include <fastrtps/types/DynamicDataFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>
-#include <fastrtps/utils/IPLocator.h>
 
 #include <fstream>
 
diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index ba99ecc59..579fda8df 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -40,6 +40,7 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
@@ -47,7 +48,6 @@
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>
 #include <fastrtps/types/DynamicTypePtr.h>
-#include <fastrtps/utils/IPLocator.h>
 
 
 using namespace eprosima::fastdds::dds;
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
index cb61cd6ba..545c68b12 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 

From 8fea622e64dd1b8edf99af947409a443cdf198fd Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Wed, 13 Mar 2024 08:13:27 +0100
Subject: [PATCH 2/3] Refs #20566: Reorder following google style

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 code/CodeTester.cpp    | 4 ++--
 code/DDSCodeTester.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp
index c59e430d5..ca60dd998 100644
--- a/code/CodeTester.cpp
+++ b/code/CodeTester.cpp
@@ -1,4 +1,6 @@
+#include <fstream>
 
+#include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
@@ -6,7 +8,6 @@
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/utils/IPLocator.h>
 #include <fastrtps/log/Log.h>
 #include <fastrtps/log/FileConsumer.h>
@@ -15,7 +16,6 @@
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>
 
-#include <fstream>
 
 using namespace eprosima::fastrtps;
 using namespace ::rtps;
diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index 579fda8df..cf1a2ae37 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -40,10 +40,10 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/types/DynamicDataFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>

From f8c5f7f4523087b120e53a8ae09f98b11b9c5a3a Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:33:37 +0100
Subject: [PATCH 3/3] Refs #20566: Fix spelling errors after rebase

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 docs/fastdds/api_reference/spelling_wordlist.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/fastdds/api_reference/spelling_wordlist.txt b/docs/fastdds/api_reference/spelling_wordlist.txt
index 0f7c60300..bef1c2b14 100644
--- a/docs/fastdds/api_reference/spelling_wordlist.txt
+++ b/docs/fastdds/api_reference/spelling_wordlist.txt
@@ -3,6 +3,7 @@ ACKs
 addReaderLocator
 addReaderProxy
 addWriterProxy
+allowlist
 assignability
 autodispose
 autoenable
@@ -94,6 +95,8 @@ mutexes
 myFilterFactory
 nackResponseDelay
 nackSupressionDuration
+netmask
+Netmask
 NonConstEnabler
 NoOpDomainParticipantListener
 nullptr