Skip to content

Commit

Permalink
Refs #20650: Regenerate types with latest changes in fastdds / fastdd…
Browse files Browse the repository at this point in the history
…s gen

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
  • Loading branch information
JesusPoderoso committed Jun 18, 2024
1 parent 36fd79c commit 5edd104
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint32_t()> getSerializedSizeProvider(
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/delivery_mechanisms/PubSubApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ PubSubApp::PubSubApp(
case CLIParser::DeliveryMechanismKind::TCP:
{
std::shared_ptr<TCPv4TransportDescriptor> tcp_transport_ = std::make_shared<TCPv4TransportDescriptor>();
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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/delivery_mechanisms/PublisherApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PublisherApp::PublisherApp(
case CLIParser::DeliveryMechanismKind::TCP:
{
std::shared_ptr<TCPv4TransportDescriptor> tcp_transport_ = std::make_shared<TCPv4TransportDescriptor>();
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;
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/delivery_mechanisms/SubscriberApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<TCPv4TransportDescriptor>());
break;
Expand Down

0 comments on commit 5edd104

Please sign in to comment.