Refs #21129: solve compilation error after rebase

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Jun 17, 2024 · 28ba6ca · 28ba6ca
1 parent 37304f3
commit 28ba6ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/examples/cpp/xtypes/SubscriberApp.cpp b/examples/cpp/xtypes/SubscriberApp.cpp
@@ -189,7 +189,7 @@ void SubscriberApp::on_data_available(
 
 void SubscriberApp::on_data_writer_discovery(
  DomainParticipant* /*participant*/,
- eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
+ eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
  bool& should_be_ignored)
 {
  // We don't want to ignore the writer

diff --git a/examples/cpp/xtypes/SubscriberApp.hpp b/examples/cpp/xtypes/SubscriberApp.hpp
@@ -60,7 +60,7 @@ class SubscriberApp : public Application, public DomainParticipantListener
 
  void on_data_writer_discovery(
  DomainParticipant* participant,
- eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
+ eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
  bool& should_be_ignored) override;
 
  //! Run subscriber

diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -886,16 +886,16 @@ class PubSubParticipant
 
  PubSubParticipant& fill_server_qos(
  eprosima::fastdds::dds::WireProtocolConfigQos& qos,
- eprosima::fastrtps::rtps::GuidPrefix_t& guid,
- eprosima::fastrtps::rtps::Locator_t& locator_server,
+ eprosima::fastdds::rtps::GuidPrefix_t& guid,
+ eprosima::fastdds::rtps::Locator_t& locator_server,
  uint16_t port,
  uint32_t kind)
  {
- qos.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol_t::SERVER;
+ qos.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
  qos.prefix = guid;
  // Generate server's listening locator
- eprosima::fastrtps::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
- eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(locator_server, port);
+ eprosima::fastdds::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
+ eprosima::fastdds::rtps::IPLocator::setPhysicalPort(locator_server, port);
  locator_server.kind = kind;
  // Leave logical port as 0 to use TCP DS default logical port
  qos.builtin.metatrafficUnicastLocatorList.push_back(locator_server);

diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -320,7 +320,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
 {
  using namespace eprosima;
  using namespace eprosima::fastdds::dds;
- using namespace eprosima::fastrtps::rtps;
+ using namespace eprosima::fastdds::rtps;
 
  // TCP default DS port
  constexpr uint16_t W_UNICAST_PORT_RANDOM_NUMBER_STR = 41100;
@@ -334,7 +334,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
  GuidPrefix_t server_1_prefix;
  for (auto i = 0; i < 12; i++)
  {
- server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254);
+ server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254);
  }
  Locator_t locator_server_1;
  uint16_t server_1_port = W_UNICAST_PORT_RANDOM_NUMBER_STR;