Skip to content

Commit 28ba6ca

Browse files
committed
Refs #21129: solve compilation error after rebase
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 37304f3 commit 28ba6ca

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

examples/cpp/xtypes/SubscriberApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void SubscriberApp::on_data_available(
189189

190190
void SubscriberApp::on_data_writer_discovery(
191191
DomainParticipant* /*participant*/,
192-
eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
192+
eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
193193
bool& should_be_ignored)
194194
{
195195
// We don't want to ignore the writer

examples/cpp/xtypes/SubscriberApp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class SubscriberApp : public Application, public DomainParticipantListener
6060

6161
void on_data_writer_discovery(
6262
DomainParticipant* participant,
63-
eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info,
63+
eprosima::fastdds::rtps::WriterDiscoveryInfo&& info,
6464
bool& should_be_ignored) override;
6565

6666
//! Run subscriber

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -886,16 +886,16 @@ class PubSubParticipant
886886

887887
PubSubParticipant& fill_server_qos(
888888
eprosima::fastdds::dds::WireProtocolConfigQos& qos,
889-
eprosima::fastrtps::rtps::GuidPrefix_t& guid,
890-
eprosima::fastrtps::rtps::Locator_t& locator_server,
889+
eprosima::fastdds::rtps::GuidPrefix_t& guid,
890+
eprosima::fastdds::rtps::Locator_t& locator_server,
891891
uint16_t port,
892892
uint32_t kind)
893893
{
894-
qos.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol_t::SERVER;
894+
qos.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
895895
qos.prefix = guid;
896896
// Generate server's listening locator
897-
eprosima::fastrtps::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
898-
eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(locator_server, port);
897+
eprosima::fastdds::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1);
898+
eprosima::fastdds::rtps::IPLocator::setPhysicalPort(locator_server, port);
899899
locator_server.kind = kind;
900900
// Leave logical port as 0 to use TCP DS default logical port
901901
qos.builtin.metatrafficUnicastLocatorList.push_back(locator_server);

test/blackbox/common/DDSBlackboxTestsDiscovery.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
320320
{
321321
using namespace eprosima;
322322
using namespace eprosima::fastdds::dds;
323-
using namespace eprosima::fastrtps::rtps;
323+
using namespace eprosima::fastdds::rtps;
324324

325325
// TCP default DS port
326326
constexpr uint16_t W_UNICAST_PORT_RANDOM_NUMBER_STR = 41100;
@@ -334,7 +334,7 @@ TEST(DDSDiscovery, ServersConnectionTCP)
334334
GuidPrefix_t server_1_prefix;
335335
for (auto i = 0; i < 12; i++)
336336
{
337-
server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254);
337+
server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254);
338338
}
339339
Locator_t locator_server_1;
340340
uint16_t server_1_port = W_UNICAST_PORT_RANDOM_NUMBER_STR;

0 commit comments

Comments
 (0)