Skip to content

Commit

Permalink
Refs #21357: Linter
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
  • Loading branch information
Mario-DL committed Jul 23, 2024
1 parent a9f850c commit 270c10a
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 24 deletions.
2 changes: 1 addition & 1 deletion include/fastdds/rtps/common/LocatorList.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class LocatorList
FASTDDS_EXPORTED_API void copy_to(
eprosima::fastdds::ResourceLimitedVector<Locator>& locator_list) const
{
for(auto& locator : m_locators)
for (auto& locator : m_locators)
{
locator_list.emplace_back(locator);
}
Expand Down
5 changes: 3 additions & 2 deletions src/cpp/fastdds/publisher/DataWriterHistory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ DataWriterHistory::DataWriterHistory(
uint32_t payloadMaxSize,
MemoryManagementPolicy_t mempolicy,
std::function<void (const fastdds::rtps::InstanceHandle_t&)> unack_sample_remove_functor)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize, mempolicy), payload_pool, change_pool)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize,
mempolicy), payload_pool, change_pool)
, history_qos_(history_qos)
, resource_limited_qos_(resource_limits_qos)
, topic_kind_(topic_kind)
Expand Down Expand Up @@ -278,7 +279,7 @@ bool DataWriterHistory::add_pub_change(
{
EPROSIMA_LOG_INFO(RTPS_HISTORY,
" Change " << change->sequenceNumber << " added with key: " << change->instanceHandle
<< " and " << change->serializedPayload.length << " bytes");
<< " and " << change->serializedPayload.length << " bytes");
returnedValue = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/fastdds/publisher/DataWriterHistory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class DataWriterHistory : public rtps::WriterHistory
{
EPROSIMA_LOG_INFO(RTPS_HISTORY,
" Change " << change->sequenceNumber << " added with key: " << change->instanceHandle
<< " and " << change->serializedPayload.length << " bytes");
<< " and " << change->serializedPayload.length << " bytes");
returnedValue = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/fastdds/publisher/DataWriterImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ PublicationBuiltinTopicData DataWriterImpl::get_publication_builtin_topic_data()
if (rtps_participant_impl_is_valid)
{
pub_builtin_data.loopback_transformation =
writer_->get_participant_impl()->network_factory().network_configuration();
writer_->get_participant_impl()->network_factory().network_configuration();
}

return pub_builtin_data;
Expand Down
3 changes: 2 additions & 1 deletion src/cpp/fastdds/subscriber/DataReaderImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2197,7 +2197,8 @@ SubscriptionBuiltinTopicData DataReaderImpl::get_subscription_builtin_topic_data

if (participant_is_valid)
{
from_proxy_to_builtin(subscriber_->get_participant()->guid().guidPrefix, sub_builtin_data.participant_key.value);
from_proxy_to_builtin(subscriber_->get_participant()->guid().guidPrefix,
sub_builtin_data.participant_key.value);
}

if (topic_is_valid)
Expand Down
8 changes: 6 additions & 2 deletions src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ bool EDP::new_reader_proxy_data(
const fastdds::dds::ReaderQos& rqos,
const fastdds::rtps::ContentFilterProperty* content_filter)
{
EPROSIMA_LOG_INFO(RTPS_EDP, "Adding " << rtps_reader->getGuid().entityId << " in topic " << sub_builtin_data.topic_name.to_string());
EPROSIMA_LOG_INFO(RTPS_EDP,
"Adding " << rtps_reader->getGuid().entityId << " in topic " <<
sub_builtin_data.topic_name.to_string());

auto init_fun = [this, rtps_reader, &sub_builtin_data, &rqos, content_filter](
ReaderProxyData* rpd,
Expand Down Expand Up @@ -205,7 +207,9 @@ bool EDP::new_writer_proxy_data(
const PublicationBuiltinTopicData& pub_builtin_data,
const fastdds::dds::WriterQos& wqos)
{
EPROSIMA_LOG_INFO(RTPS_EDP, "Adding " << rtps_writer->getGuid().entityId << " in topic " << pub_builtin_data.topic_name.to_string());
EPROSIMA_LOG_INFO(RTPS_EDP,
"Adding " << rtps_writer->getGuid().entityId << " in topic " <<
pub_builtin_data.topic_name.to_string());

auto init_fun = [this, rtps_writer, &pub_builtin_data, &wqos](
WriterProxyData* wpd,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ class DataWriterHistory : public WriterHistory
public:

static HistoryAttributes to_history_attributes(
const HistoryQosPolicy& history_qos,
const ResourceLimitsQosPolicy& resource_limits_qos,
const rtps::TopicKind_t& topic_kind,
uint32_t payloadMaxSize,
MemoryManagementPolicy_t mempolicy)
const HistoryQosPolicy& history_qos,
const ResourceLimitsQosPolicy& resource_limits_qos,
const rtps::TopicKind_t& topic_kind,
uint32_t payloadMaxSize,
MemoryManagementPolicy_t mempolicy)
{
auto initial_samples = resource_limits_qos.allocated_samples;
auto max_samples = resource_limits_qos.max_samples;
Expand Down Expand Up @@ -78,7 +78,8 @@ class DataWriterHistory : public WriterHistory
uint32_t payloadMaxSize,
MemoryManagementPolicy_t mempolicy,
std::function<void (const fastdds::rtps::InstanceHandle_t&)> unack_sample_remove_functor)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize, mempolicy), payload_pool, change_pool)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize,
mempolicy), payload_pool, change_pool)
, history_qos_(history_qos)
, resource_limited_qos_(resource_limits_qos)
, topic_kind_(topic_kind)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,17 @@ class DataWriterHistory : public fastdds::rtps::WriterHistory
{
public:

DataWriterHistory(
const std::shared_ptr<rtps::IPayloadPool>& payload_pool,
const std::shared_ptr<rtps::IChangePool>& change_pool,
const HistoryQosPolicy& history_qos,
const ResourceLimitsQosPolicy& resource_limits_qos,
const rtps::TopicKind_t& topic_kind,
uint32_t payloadMaxSize,
rtps::MemoryManagementPolicy_t mempolicy,
std::function<void (const fastdds::rtps::InstanceHandle_t&)>)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize, mempolicy), payload_pool, change_pool)
DataWriterHistory(
const std::shared_ptr<rtps::IPayloadPool>& payload_pool,
const std::shared_ptr<rtps::IChangePool>& change_pool,
const HistoryQosPolicy& history_qos,
const ResourceLimitsQosPolicy& resource_limits_qos,
const rtps::TopicKind_t& topic_kind,
uint32_t payloadMaxSize,
rtps::MemoryManagementPolicy_t mempolicy,
std::function<void (const fastdds::rtps::InstanceHandle_t&)>)
: WriterHistory(to_history_attributes(history_qos, resource_limits_qos, topic_kind, payloadMaxSize,
mempolicy), payload_pool, change_pool)
{
}

Expand Down

0 comments on commit 270c10a

Please sign in to comment.