Skip to content

Commit 47e6878

Browse files
cferreiragonzcferreiragonz
committed
Uncrustify
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
1 parent bea7075 commit 47e6878

2 files changed

Lines changed: 29 additions & 26 deletions

File tree

‎src/cpp/fastdds/subscriber/DataReaderImpl.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,11 +1617,11 @@ ReturnCode_t DataReaderImpl::check_qos(
16171617
qos.history().depth > qos.resource_limits().max_samples_per_instance)
16181618
{
16191619
EPROSIMA_LOG_WARNING(RTPS_QOS_CHECK,
1620-
"HISTORY DEPTH '" << qos.history().depth <<
1621-
"' is inconsistent with max_samples_per_instance: '" <<
1622-
qos.resource_limits().max_samples_per_instance <<
1623-
"'. Consistency rule: depth <= max_samples_per_instance." <<
1624-
" Effectively using max_samples_per_instance as depth.");
1620+
"HISTORY DEPTH '" << qos.history().depth
1621+
<< "' is inconsistent with max_samples_per_instance: '"
1622+
<< qos.resource_limits().max_samples_per_instance
1623+
<< "'. Consistency rule: depth <= max_samples_per_instance."
1624+
<< " Effectively using max_samples_per_instance as depth.");
16251625
}
16261626
// Check for nanoseconds in all duration policies
16271627
if (!utils::is_duration_consistent(qos.deadline().period))

‎src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ bool EDP::new_reader_proxy_data(
9797
const fastdds::rtps::ContentFilterProperty* content_filter)
9898
{
9999
EPROSIMA_LOG_INFO(RTPS_EDP,
100-
"Adding " << rtps_reader->getGuid().entityId << " in topic " <<
101-
topic.topic_name.to_string());
100+
"Adding " << rtps_reader->getGuid().entityId << " in topic "
101+
<< topic.topic_name.to_string());
102102

103103
auto init_fun = [this, rtps_reader, &topic, &qos, content_filter](
104104
ReaderProxyData* rpd,
@@ -243,8 +243,8 @@ dds::ReturnCode_t EDP::new_reader_proxy_data(
243243
const fastdds::rtps::ContentFilterProperty* content_filter)
244244
{
245245
EPROSIMA_LOG_INFO(RTPS_EDP,
246-
"Adding " << rtps_reader->getGuid().entityId << " in topic " <<
247-
topic.topic_name.to_string());
246+
"Adding " << rtps_reader->getGuid().entityId << " in topic "
247+
<< topic.topic_name.to_string());
248248

249249
auto init_fun = [this, rtps_reader, &topic, &sub_builtin_topic_data, content_filter](
250250
ReaderProxyData* rpd,
@@ -388,8 +388,8 @@ bool EDP::new_writer_proxy_data(
388388
const fastdds::dds::WriterQos& qos)
389389
{
390390
EPROSIMA_LOG_INFO(RTPS_EDP,
391-
"Adding " << rtps_writer->getGuid().entityId << " in topic " <<
392-
topic.topic_name.to_string());
391+
"Adding " << rtps_writer->getGuid().entityId << " in topic "
392+
<< topic.topic_name.to_string());
393393

394394
auto init_fun = [this, rtps_writer, &topic, &qos](
395395
WriterProxyData* wpd,
@@ -521,8 +521,8 @@ dds::ReturnCode_t EDP::new_writer_proxy_data(
521521
bool should_send_opt_qos)
522522
{
523523
EPROSIMA_LOG_INFO(RTPS_EDP,
524-
"Adding " << rtps_writer->getGuid().entityId << " in topic " <<
525-
topic.topic_name.to_string());
524+
"Adding " << rtps_writer->getGuid().entityId << " in topic "
525+
<< topic.topic_name.to_string());
526526

527527
auto init_fun = [this, rtps_writer, &topic, &pub_builtin_topic_data](
528528
WriterProxyData* wpd,
@@ -886,8 +886,10 @@ bool EDP::valid_matching(
886886
if (wdata->topic_kind != rdata->topic_kind)
887887
{
888888
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS:Remote Reader " << rdata->guid << " is publishing in topic "
889-
<< rdata->topic_name << "(keyed:" << rdata->topic_kind <<
890-
"), local writer publishes as keyed: " << wdata->topic_kind);
889+
<< rdata->topic_name << "(keyed:"
890+
<< rdata->topic_kind
891+
<< "), local writer publishes as keyed: "
892+
<< wdata->topic_kind);
891893
reason.set(MatchingFailureMask::inconsistent_topic);
892894
return false;
893895
}
@@ -904,16 +906,17 @@ bool EDP::valid_matching(
904906
//Means our writer is BE but the reader wants RE
905907
{
906908
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS (topic: " << rdata->topic_name << "):Remote Reader "
907-
<< rdata->guid <<
908-
" is Reliable and local writer is BE ");
909+
<< rdata->guid
910+
<< " is Reliable and local writer is BE ");
909911
incompatible_qos.set(fastdds::dds::RELIABILITY_QOS_POLICY_ID);
910912
}
911913

912914
if (wdata->durability.kind < rdata->durability.kind)
913915
{
914916
// TODO (MCC) Change log message
915917
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS (topic: " << rdata->topic_name << "):RemoteReader "
916-
<< rdata->guid <<
918+
<< rdata->guid
919+
<<
917920
" has TRANSIENT_LOCAL DURABILITY and we offer VOLATILE");
918921
incompatible_qos.set(fastdds::dds::DURABILITY_QOS_POLICY_ID);
919922
}
@@ -1140,8 +1143,8 @@ bool EDP::pairingReader(
11401143
{
11411144
static_cast<void>(reader_guid); // Void cast to force usage if we don't have LOG_INFOs
11421145
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1143-
"WP:" << wdatait->guid << " match R:" << reader_guid << ". RLoc:" <<
1144-
wdatait->remote_locators);
1146+
"WP:" << wdatait->guid << " match R:" << reader_guid << ". RLoc:"
1147+
<< wdatait->remote_locators);
11451148
//MATCHED AND ADDED CORRECTLY:
11461149
ReaderListener* listener = reader->get_listener();
11471150
if (nullptr != listener)
@@ -1232,8 +1235,8 @@ bool EDP::pairingWriter(
12321235
if (writer->matched_reader_add_edp(*rdatait))
12331236
{
12341237
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1235-
"RP:" << rdatait->guid << " match W:" << writer_guid << ". WLoc:" <<
1236-
rdatait->remote_locators);
1238+
"RP:" << rdatait->guid << " match W:" << writer_guid << ". WLoc:"
1239+
<< rdatait->remote_locators);
12371240
//MATCHED AND ADDED CORRECTLY:
12381241
WriterListener* listener = writer->get_listener();
12391242
if (nullptr != listener)
@@ -1310,8 +1313,8 @@ bool EDP::pairing_reader_proxy_with_any_local_writer(
13101313
if (w.matched_reader_add_edp(*rdata))
13111314
{
13121315
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1313-
"RP:" << rdata->guid << " match W:" << w.getGuid() << ". RLoc:" <<
1314-
rdata->remote_locators);
1316+
"RP:" << rdata->guid << " match W:" << w.getGuid() << ". RLoc:"
1317+
<< rdata->remote_locators);
13151318
//MATCHED AND ADDED CORRECTLY:
13161319
WriterListener* listener = w.get_listener();
13171320
if (nullptr != listener)
@@ -1504,8 +1507,8 @@ bool EDP::pairing_writer_proxy_with_any_local_reader(
15041507
if (r.matched_writer_add_edp(*wdata))
15051508
{
15061509
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1507-
"WP:" << wdata->guid << " match R:" << r.getGuid() << ". WLoc:" <<
1508-
wdata->remote_locators);
1510+
"WP:" << wdata->guid << " match R:" << r.getGuid() << ". WLoc:"
1511+
<< wdata->remote_locators);
15091512
//MATCHED AND ADDED CORRECTLY:
15101513
ReaderListener* listener = r.get_listener();
15111514
if (nullptr != listener)

0 commit comments

Comments
 (0)