From 5edd10490e62c64e20582d0c8f52815af8d17396 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 18 Jun 2024 12:55:52 +0200 Subject: [PATCH] Refs #20650: Regenerate types with latest changes in fastdds / fastdds gen Signed-off-by: JesusPoderoso --- .../delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx | 4 ++-- .../delivery_mechanisms/DeliveryMechanismsPubSubTypes.h | 8 ++++---- examples/cpp/delivery_mechanisms/PubSubApp.cpp | 4 ++-- examples/cpp/delivery_mechanisms/PublisherApp.cpp | 2 +- examples/cpp/delivery_mechanisms/SubscriberApp.cpp | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx index b89ea385fb6..f2a27977542 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "DeliveryMechanismsCdrAux.hpp" #include "DeliveryMechanismsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; DeliveryMechanismsPubSubType::DeliveryMechanismsPubSubType() diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.h b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.h index 052ca39c97c..2b157c4ed99 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.h +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.h @@ -87,18 +87,18 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -113,7 +113,7 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.cpp b/examples/cpp/delivery_mechanisms/PubSubApp.cpp index 4d2ffe52c5b..9b0d17afb64 100644 --- a/examples/cpp/delivery_mechanisms/PubSubApp.cpp +++ b/examples/cpp/delivery_mechanisms/PubSubApp.cpp @@ -109,7 +109,7 @@ PubSubApp::PubSubApp( case CLIParser::DeliveryMechanismKind::TCP: { std::shared_ptr tcp_transport_ = std::make_shared(); - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0); tcp_transport_->sendBufferSize = 0; tcp_transport_->receiveBufferSize = 0; @@ -118,7 +118,7 @@ PubSubApp::PubSubApp( Locator tcp_initial_peers_locator_; tcp_initial_peers_locator_.kind = LOCATOR_KIND_TCPv4; tcp_initial_peers_locator_.port = 5100; - eprosima::fastrtps::rtps::IPLocator::setIPv4(tcp_initial_peers_locator_, "127.0.0.1"); + eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_initial_peers_locator_, "127.0.0.1"); pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_initial_peers_locator_); break; } diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.cpp b/examples/cpp/delivery_mechanisms/PublisherApp.cpp index 680aa699a4c..c13f633a0c6 100644 --- a/examples/cpp/delivery_mechanisms/PublisherApp.cpp +++ b/examples/cpp/delivery_mechanisms/PublisherApp.cpp @@ -92,7 +92,7 @@ PublisherApp::PublisherApp( case CLIParser::DeliveryMechanismKind::TCP: { std::shared_ptr tcp_transport_ = std::make_shared(); - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0); tcp_transport_->sendBufferSize = 0; tcp_transport_->receiveBufferSize = 0; diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp index 2801703555c..fe001cce015 100644 --- a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp +++ b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp @@ -95,9 +95,9 @@ SubscriberApp::SubscriberApp( Locator tcp_initial_peers_locator_; tcp_initial_peers_locator_.kind = LOCATOR_KIND_TCPv4; tcp_initial_peers_locator_.port = 5100; - eprosima::fastrtps::rtps::IPLocator::setIPv4(tcp_initial_peers_locator_, "127.0.0.1"); + eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_initial_peers_locator_, "127.0.0.1"); pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_initial_peers_locator_); - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0); pqos.transport().user_transports.push_back(std::make_shared()); break;