Refs #20629: Rebase

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

Author: cferreiragonz

src/cpp/rtps/RTPSDomain.cpp

@@ -223,7 +223,7 @@ RTPSParticipant* RTPSDomainImpl::createParticipant(
     }
     else
     {
-        if (PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol_t::BACKUP)
+        if (PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::BACKUP)
         {
             EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT, "Specifying a GUID prefix is mandatory for BACKUP Discovery Servers.");
             return nullptr;

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

@@ -69,7 +69,7 @@ void DiscoveryDataBase::add_server(
 }
 
 void DiscoveryDataBase::remove_server(
-        fastrtps::rtps::GuidPrefix_t server)
+        fastdds::rtps::GuidPrefix_t server)
 {
     std::lock_guard<std::recursive_mutex> guard(mutex_);
     if (servers_.erase(server) == 1)

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp

@@ -344,7 +344,7 @@ class DiscoveryDataBase
 
     //! Remove a server from the list of remote servers
     void remove_server(
-            fastrtps::rtps::GuidPrefix_t server);
+            fastdds::rtps::GuidPrefix_t server);
 
     // Removes all the changes whose original sender was entity_guid_prefix from writer_history
     void remove_related_alive_from_history_nts(

src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp

@@ -57,7 +57,7 @@ class DiscoveryParticipantChangeData
     }
 
     DiscoveryParticipantChangeData(
-            fastrtps::rtps::RemoteLocatorList metatraffic_locators,
+            RemoteLocatorList metatraffic_locators,
             bool is_client,
             bool is_local,
             bool is_superclient)

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

@@ -227,7 +227,7 @@ bool PDP::data_matches_with_prefix(
 }
 
 std::string PDP::check_participant_type(
-        const eprosima::fastrtps::ParameterPropertyList_t properties)
+        const fastdds::dds::ParameterPropertyList_t properties)
 {
     auto participant_type = std::find_if(
         properties.begin(),

src/cpp/rtps/builtin/discovery/participant/PDP.h

@@ -579,7 +579,7 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable
      * @return a string indicating the participant type.
      */
     std::string check_participant_type(
-            const eprosima::fastrtps::ParameterPropertyList_t properties);
+            const fastdds::dds::ParameterPropertyList_t properties);
 
     /**
      * Gets the key of a participant proxy data.

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

@@ -293,15 +293,15 @@ class PDPServer : public fastdds::rtps::PDP
      * It does however take temp_data_lock_
      */
     void match_pdp_writer_nts_(
-            const fastrtps::rtps::ParticipantProxyData& pdata);
+            const fastdds::rtps::ParticipantProxyData& pdata);
 
     /**
      * Manually match the local PDP writer with the PDP reader of a given partipant of type server.
      * The function is not thread safe (nts) in the sense that it does not take the PDP mutex.
      * It does however take temp_data_lock_
      */
     void match_pdp_reader_nts_(
-            const fastrtps::rtps::ParticipantProxyData& pdata);
+            const fastdds::rtps::ParticipantProxyData& pdata);
 
     /**
      * Release a change from the history of the PDP writer.

tools/fds/server.cpp

@@ -193,7 +193,7 @@ int fastdds_discovery_server(
         }
         else if (participantQos.wire_protocol().prefix == prefix_cero &&
                 participantQos.wire_protocol().builtin.discovery_config.discoveryProtocol ==
-                eprosima::fastrtps::rtps::DiscoveryProtocol::BACKUP)
+                eprosima::fastdds::rtps::DiscoveryProtocol::BACKUP)
         {
             // Discovery protocol specified in XML is BACKUP, but no GUID was specified
             std::cout << "Specifying a GUID prefix is mandatory for BACKUP Discovery Servers." <<
@@ -233,7 +233,7 @@ int fastdds_discovery_server(
     pOp = options[BACKUP];
     if (nullptr != pOp)
     {
-        fastrtps::rtps::GuidPrefix_t prefix_cero;
+        fastdds::rtps::GuidPrefix_t prefix_cero;
         if (participantQos.wire_protocol().prefix == prefix_cero && server_id == -1)
         {
             // BACKUP argument used, but no GUID was specified either in the XML nor in the CLI