Refs #20160: Fixes after rebase.

Signed-off-by: adriancampo <[email protected]>

Author: adriancampo

src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp

@@ -26,7 +26,6 @@
 #include <string>
 #include <tuple>
 #include <vector>
-#include <vector>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/dds/log/Log.hpp>
@@ -37,8 +36,8 @@
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastrtps/utils/shared_mutex.hpp>
-#include <fastrtps/utils/TimeConversion.h>
+
+#include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDPClient.h>
 #include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
 #include <rtps/builtin/discovery/participant/DS/FakeWriter.hpp>
@@ -49,6 +48,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
+#include <utils/TimeConversion.hpp>
 
 using namespace eprosima::fastrtps;
 

src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp

@@ -25,17 +25,15 @@
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/BuiltinProtocols.h>
-#include <fastdds/rtps/builtin/liveliness/WLP.h>
 #include <fastdds/rtps/history/History.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastrtps/utils/TimeConversion.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
+#include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPServerListeners.hpp>
@@ -46,10 +44,10 @@
 #include <rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
 #include <rtps/builtin/discovery/participant/PDPServerListener.hpp>
-#include <rtps/builtin/discovery/participant/PDPServer.hpp>
-#include <rtps/builtin/discovery/participant/PDPServerListener.hpp>
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
+#include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <utils/TimeConversion.hpp>
 
 namespace eprosima {
 namespace fastdds {

test/blackbox/api/dds-pim/PubSubReader.hpp

@@ -146,7 +146,7 @@ class PubSubReader
     private:
 
         using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
-        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_data_writer_discovery;
 
         ParticipantListener& operator =(
                 const ParticipantListener&) = delete;

test/blackbox/api/dds-pim/PubSubWriter.hpp

@@ -157,8 +157,8 @@ class PubSubWriter
     private:
 
         using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
-        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
-        using eprosima::fastdds::dds::DomainParticipantListener::on_subscriber_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_data_writer_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_data_reader_discovery;
 
         ParticipantListener& operator =(
                 const ParticipantListener&) = delete;

test/blackbox/api/dds-pim/PubSubWriterReader.hpp

@@ -173,8 +173,8 @@ class PubSubWriterReader
     private:
 
         using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
-        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
-        using eprosima::fastdds::dds::DomainParticipantListener::on_subscriber_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_data_writer_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_data_reader_discovery;
 
         //! Mutex guarding all info collections
         mutable std::mutex info_mutex_;

test/unittest/dds/publisher/DataWriterTests.cpp

@@ -391,7 +391,7 @@ TEST(DataWriterTests, get_guid)
 
     private:
 
-        using DomainParticipantListener::on_publisher_discovery;
+        using DomainParticipantListener::on_data_writer_discovery;
     }
     discovery_listener;
 

test/unittest/dds/subscriber/DataReaderTests.cpp

@@ -597,7 +597,7 @@ TEST_F(DataReaderTests, get_guid)
 
     private:
 
-        using DomainParticipantListener::on_subscriber_discovery;
+        using DomainParticipantListener::on_data_reader_discovery;
     }
     discovery_listener;