Skip to content

Commit

Permalink
Move Time_t to dds namespace and some *Attributes to xmlparser (#…
Browse files Browse the repository at this point in the history 
…5065)

* Refs #21321: Move *Attributes expect for TopicAttributes to eprosima::fastdds::xmlparser namespace

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Split in two files and move eprosima::fastdds::Time_t to eprosima::fastdds::dds::Time_t

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Update references to Time_t in sources

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Update references to Time_t in tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Update references to Time_t in examples

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: versions.md

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Apply Jesus suggestions

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21321: Remove duplicated xmlparser::xmlparser

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
  • Loading branch information
@Mario-DL
Mario-DL authored Jul 23, 2024
1 parent 8341bdd commit fec5777
Show file tree
Hide file tree
Showing 165 changed files with 1,264 additions and 1,095 deletions.
10 changes: 5 additions & 5 deletions examples/cpp/configuration/PublisherApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,26 +143,26 @@ PublisherApp::PublisherApp(
writer_qos.ownership_strength().value = config.ownership_strength;
if (config.deadline > 0)
{
writer_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3);
writer_qos.deadline().period = eprosima::fastdds::dds::Duration_t(config.deadline * 1e-3);
}
writer_qos.reliable_writer_qos().disable_positive_acks.enabled = config.disable_positive_ack;
if (config.ack_keep_duration > 0)
{
writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastdds::Duration_t(
writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastdds::dds::Duration_t(
config.ack_keep_duration * 1e-3);
}
if (config.lifespan > 0)
{
writer_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3);
writer_qos.lifespan().duration = eprosima::fastdds::dds::Duration_t(config.lifespan * 1e-3);
}
writer_qos.liveliness().kind = config.liveliness;
if (config.liveliness_lease > 0)
{
writer_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(config.liveliness_lease * 1e-3);
writer_qos.liveliness().lease_duration = eprosima::fastdds::dds::Duration_t(config.liveliness_lease * 1e-3);
}
if (config.liveliness_assert > 0)
{
writer_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(
writer_qos.liveliness().announcement_period = eprosima::fastdds::dds::Duration_t(
config.liveliness_assert * 1e-3);
}
writer_ = publisher_->create_datawriter(topic_, writer_qos, this, StatusMask::all());
Expand Down
8 changes: 4 additions & 4 deletions examples/cpp/configuration/SubscriberApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,21 +127,21 @@ SubscriberApp::SubscriberApp(
reader_qos.ownership().kind = config.ownership;
if (config.deadline > 0)
{
reader_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3);
reader_qos.deadline().period = eprosima::fastdds::dds::Duration_t(config.deadline * 1e-3);
}
reader_qos.reliable_reader_qos().disable_positive_acks.enabled = config.disable_positive_ack;
if (config.lifespan > 0)
{
reader_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3);
reader_qos.lifespan().duration = eprosima::fastdds::dds::Duration_t(config.lifespan * 1e-3);
}
reader_qos.liveliness().kind = config.liveliness;
if (config.liveliness_lease > 0)
{
reader_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(config.liveliness_lease * 1e-3);
reader_qos.liveliness().lease_duration = eprosima::fastdds::dds::Duration_t(config.liveliness_lease * 1e-3);
}
if (config.liveliness_assert > 0)
{
reader_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(
reader_qos.liveliness().announcement_period = eprosima::fastdds::dds::Duration_t(
config.liveliness_assert * 1e-3);
}
reader_ = subscriber_->create_datareader(topic_, reader_qos, this, StatusMask::all());
Expand Down
8 changes: 4 additions & 4 deletions examples/cpp/delivery_mechanisms/PubSubApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ PubSubApp::PubSubApp(
case CLIParser::DeliveryMechanismKind::TCPv4:
{
std::shared_ptr<TCPv4TransportDescriptor> tcp_v4_transport_ = std::make_shared<TCPv4TransportDescriptor>();
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
tcp_v4_transport_->sendBufferSize = 0;
tcp_v4_transport_->receiveBufferSize = 0;
std::string tcp_ip_address = "127.0.0.1";
Expand Down Expand Up @@ -154,8 +154,8 @@ PubSubApp::PubSubApp(
case CLIParser::DeliveryMechanismKind::TCPv6:
{
std::shared_ptr<TCPv6TransportDescriptor> tcp_v6_transport_ = std::make_shared<TCPv6TransportDescriptor>();
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
tcp_v6_transport_->sendBufferSize = 0;
tcp_v6_transport_->receiveBufferSize = 0;
std::string tcp_ip_address = "::1";
Expand Down
8 changes: 4 additions & 4 deletions examples/cpp/delivery_mechanisms/PublisherApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ PublisherApp::PublisherApp(
case CLIParser::DeliveryMechanismKind::TCPv4:
{
std::shared_ptr<TCPv4TransportDescriptor> tcp_v4_transport_ = std::make_shared<TCPv4TransportDescriptor>();
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
tcp_v4_transport_->sendBufferSize = 0;
tcp_v4_transport_->receiveBufferSize = 0;
std::string tcp_ip_address = "127.0.0.1";
Expand All @@ -133,8 +133,8 @@ PublisherApp::PublisherApp(
case CLIParser::DeliveryMechanismKind::TCPv6:
{
std::shared_ptr<TCPv6TransportDescriptor> tcp_v6_transport_ = std::make_shared<TCPv6TransportDescriptor>();
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
tcp_v6_transport_->sendBufferSize = 0;
tcp_v6_transport_->receiveBufferSize = 0;
std::string tcp_ip_address = "::1";
Expand Down
8 changes: 4 additions & 4 deletions examples/cpp/delivery_mechanisms/SubscriberApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ SubscriberApp::SubscriberApp(
}
IPLocator::setIPv4(tcp_v4_initial_peers_locator_, tcp_ip_address);
pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v4_initial_peers_locator_);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
pqos.transport().user_transports.push_back(std::make_shared<TCPv4TransportDescriptor>());
break;
}
Expand All @@ -135,8 +135,8 @@ SubscriberApp::SubscriberApp(
}
IPLocator::setIPv6(tcp_v6_initial_peers_locator_, tcp_ip_address);
pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v6_initial_peers_locator_);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::dds::c_TimeInfinite;
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = dds::Duration_t(5, 0);
pqos.transport().user_transports.push_back(std::make_shared<TCPv6TransportDescriptor>());
break;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/hello_world/WaitsetSubscriberApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void WaitsetSubscriberApp::run()
while (!is_stopped())
{
ConditionSeq triggered_conditions;
ReturnCode_t ret_code = wait_set_.wait(triggered_conditions, eprosima::fastdds::c_TimeInfinite);
ReturnCode_t ret_code = wait_set_.wait(triggered_conditions, eprosima::fastdds::dds::c_TimeInfinite);
if (RETCODE_OK != ret_code)
{
EPROSIMA_LOG_ERROR(SUBSCRIBER_WAITSET, "Error waiting for conditions");
Expand Down
Loading

0 comments on commit fec5777

Please sign in to comment.