Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20566] Migrate classes from include/fastrtps to fastdds #4518

Merged
merged 12 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refs #20566: Migrate fastrtps/utils/IPFinder.h to fastdds/utils
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
  • Loading branch information
elianalf committed Mar 21, 2024
commit e1869e42884bbe62bde8d32a7499c38e0285d118
2 changes: 1 addition & 1 deletion include/fastdds/rtps/rtps_all.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <fastdds/rtps/reader/ReaderListener.h>
#include <fastdds/rtps/history/ReaderHistory.h>

#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/TimeConversion.h>

#include <fastrtps/qos/QosPolicies.h>
Expand Down
EduPonz marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
2 changes: 1 addition & 1 deletion include/fastrtps/fastrtps_all.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <fastrtps/subscriber/SampleInfo.h>
#include <fastrtps/TopicDataType.h>

#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/TimeConversion.h>

#include <fastrtps/qos/QosPolicies.h>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/RTPSDomain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/md5.h>
#include <fastdds/utils/md5.h>
EduPonz marked this conversation as resolved.
Show resolved Hide resolved

#include <rtps/common/GuidUtils.hpp>
#include <rtps/network/utils/external_locators.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/BuiltinProtocols.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <rtps/participant/RTPSParticipantImpl.h>

#include <fastdds/dds/log/Log.hpp>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include <algorithm>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/network/NetworkFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <fastdds/rtps/common/LocatorList.hpp>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>

#include <rtps/transport/TCPTransportInterface.h>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/participant/RTPSParticipantImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/writer/StatelessPersistentWriter.h>
#include <fastdds/rtps/writer/StatefulPersistentWriter.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/Semaphore.h>
#include <fastrtps/utils/UnitsParser.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/transport/TCPTransportInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
#include <fastdds/rtps/transport/TransportInterface.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include <rtps/transport/tcp/RTCPHeader.h>
#include <rtps/transport/TCPAcceptorBasic.h>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/transport/TCPv4Transport.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <asio.hpp>
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <rtps/transport/TCPTransportInterface.h>
#include <rtps/transport/tcp/RTCPHeader.h>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/transport/TCPv6Transport.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <asio.hpp>

#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <rtps/transport/TCPTransportInterface.h>
#include <rtps/transport/tcp/RTCPHeader.h>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/transport/UDPTransportInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
#include <fastdds/rtps/transport/TransportInterface.h>
#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include <rtps/transport/UDPChannelResource.h>
#include <statistics/rtps/messages/OutputTrafficManager.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/utils/Host.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/common/LocatorList.hpp>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/md5.h>

namespace eprosima {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/utils/IPFinder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>

#include <fastdds/dds/log/Log.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/utils/IPLocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <asio.hpp>

#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

namespace eprosima {
namespace fastrtps {
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include <gtest/gtest.h>

Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/common/BlackboxTestsNetworkConf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <gtest/gtest.h>
#include <fastdds/rtps/common/Locator.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include "BlackboxTests.hpp"
#include "PubSubReader.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/common/BlackboxTestsTransportUDP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>

#include "BlackboxTests.hpp"
#include "DatagramInjectionTransport.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/common/RTPSWithRegistrationReader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/rtps/attributes/TopicAttributes.h>
#include <fastrtps/rtps/rtps_fwd.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/TimedMutex.hpp>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion test/performance/video/VideoTestTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <fastdds/rtps/attributes/PropertyPolicy.h>
#include <fastdds/rtps/common/all_common.h>

#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/TimeConversion.h>


Expand Down
2 changes: 1 addition & 1 deletion test/unittest/transport/TCPv4Tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/common/LocatorList.hpp>
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/Semaphore.h>

Expand Down
2 changes: 1 addition & 1 deletion test/unittest/transport/UDPv4Tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <gtest/gtest.h>

#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
#include <fastrtps/utils/IPFinder.h>
#include <fastdds/utils/IPFinder.h>
#include <fastrtps/utils/IPLocator.h>
#include <fastrtps/utils/Semaphore.h>

Expand Down