Refs #20566: fix rebase error

Signed-off-by: elianalf <[email protected]>
eProsima · Mar 21, 2024 · 2460f0e · 2460f0e
1 parent 5c68ee2
commit 2460f0e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
-#include <fasdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <utils/SystemInfo.hpp>
 
 #include <rtps/network/utils/external_locators.hpp>

diff --git a/src/cpp/utils/SystemInfo.cpp b/src/cpp/utils/SystemInfo.cpp
@@ -36,8 +36,8 @@
 
 #include <nlohmann/json.hpp>
 
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/IPFinder.h>
 #include <utils/threading.hpp>
 
 namespace eprosima {

diff --git a/src/cpp/utils/SystemInfo.hpp b/src/cpp/utils/SystemInfo.hpp
@@ -27,9 +27,8 @@
 #include <string>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/IPFinder.h>
 #include <utils/Host.hpp>
 
 #if defined(_WIN32) || defined(__unix__)

diff --git a/test/blackbox/common/UDPMessageSender.hpp b/test/blackbox/common/UDPMessageSender.hpp
@@ -2,7 +2,7 @@
 #include <asio/ip/udp.hpp>
 
 #include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;

diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.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 "UnboundedHelloWorld.h"