Solve 2.14 conflicts

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
eProsima · Dec 17, 2024 · afd25d4 · afd25d4
1 parent a4cd149
commit afd25d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -685,7 +685,7 @@ class PubSubParticipant
     }
 
     PubSubParticipant& initial_peers(
-            const eprosima::fastdds::rtps::LocatorList& initial_peers)
+            const eprosima::fastrtps::rtps::LocatorList_t& initial_peers)
     {
         participant_qos_.wire_protocol().builtin.initialPeersList = initial_peers;
         return *this;

diff --git a/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp b/test/blackbox/api/fastrtps_deprecated/PubSubParticipant.hpp
@@ -437,6 +437,13 @@ class PubSubParticipant
         return *this;
     }
 
+    PubSubParticipant& initial_peers(
+            const eprosima::fastrtps::rtps::LocatorList_t& initial_peers)
+    {
+        participant_attr_.rtps.builtin.initialPeersList = initial_peers;
+        return *this;
+    }
+
     PubSubParticipant& pub_property_policy(
             const eprosima::fastrtps::rtps::PropertyPolicy property_policy)
     {

diff --git a/test/blackbox/common/BlackboxTestsTransportTCP.cpp b/test/blackbox/common/BlackboxTestsTransportTCP.cpp
@@ -1470,19 +1470,19 @@ TEST_P(TransportTCP, tcp_unique_network_flows_communication)
     properties.properties().emplace_back("fastdds.unique_network_flows", "");
     readers.disable_builtin_transport().add_user_transport_to_pparams(test_transport_);
 
-    eprosima::fastdds::rtps::Locator_t initial_peer_locator;
+    Locator_t initial_peer_locator;
     if (use_ipv6)
     {
         initial_peer_locator.kind = LOCATOR_KIND_TCPv6;
-        eprosima::fastdds::rtps::IPLocator::setIPv6(initial_peer_locator, "::1");
+        IPLocator::setIPv6(initial_peer_locator, "::1");
     }
     else
     {
         initial_peer_locator.kind = LOCATOR_KIND_TCPv4;
-        eprosima::fastdds::rtps::IPLocator::setIPv4(initial_peer_locator, "127.0.0.1");
+        IPLocator::setIPv4(initial_peer_locator, "127.0.0.1");
     }
-    eprosima::fastdds::rtps::IPLocator::setPhysicalPort(initial_peer_locator, global_port);
-    eprosima::fastdds::rtps::LocatorList_t initial_peer_list;
+    IPLocator::setPhysicalPort(initial_peer_locator, global_port);
+    LocatorList_t initial_peer_list;
     initial_peer_list.push_back(initial_peer_locator);
 
     readers.sub_topic_name(TEST_TOPIC_NAME)