Skip to content

Commit a36ff8b

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

14 files changed

Lines changed: 150 additions & 140 deletions

‎include/fastdds/rtps/messages/CDRMessage.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ inline bool CDRMessage::add_string(
648648
bool valid = CDRMessage::addUInt32(msg, str_siz);
649649
valid &= CDRMessage::addData(msg, (unsigned char*) in_str, str_siz);
650650
octet oc = '\0';
651-
for (; str_siz& 3; ++str_siz)
651+
for (; str_siz & 3; ++str_siz)
652652
{
653653
valid &= CDRMessage::addOctet(msg, oc);
654654
}

‎src/cpp/fastdds/domain/DomainParticipantFactory.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ DomainParticipant* DomainParticipantFactory::create_participant(
170170
DomainParticipant* dom_part = new DomainParticipant(mask);
171171
DomainParticipantImpl* dom_part_impl = new DomainParticipantImpl(dom_part, did, pqos, listen);
172172
#else
173-
eprosima::fastdds::statistics::dds::DomainParticipant* dom_part = new eprosima::fastdds::statistics::dds::DomainParticipant(mask);
173+
eprosima::fastdds::statistics::dds::DomainParticipant* dom_part =
174+
new eprosima::fastdds::statistics::dds::DomainParticipant(mask);
174175
eprosima::fastdds::statistics::dds::DomainParticipantImpl* dom_part_impl =
175176
new eprosima::fastdds::statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listen);
176177
#endif // FASTDDS_STATISTICS

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

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ bool EDP::updatedLocalReader(
446446
if (!rdata->type_information().assigned())
447447
{
448448
const types::TypeInformation* type_info =
449-
types::TypeObjectFactory::get_instance()->get_type_information(rdata->typeName().c_str());
449+
types::TypeObjectFactory::get_instance()->get_type_information(
450+
rdata->typeName().c_str());
450451
if (type_info != nullptr)
451452
{
452453
rdata->type_information() = *type_info;
@@ -538,7 +539,8 @@ bool EDP::updatedLocalWriter(
538539
if (!wdata->type_information().assigned())
539540
{
540541
const types::TypeInformation* type_info =
541-
types::TypeObjectFactory::get_instance()->get_type_information(wdata->typeName().c_str());
542+
types::TypeObjectFactory::get_instance()->get_type_information(
543+
wdata->typeName().c_str());
542544
if (type_info != nullptr)
543545
{
544546
wdata->type_information() = *type_info;
@@ -714,8 +716,10 @@ bool EDP::valid_matching(
714716
if (wdata->topicKind() != rdata->topicKind())
715717
{
716718
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS:Remote Reader " << rdata->guid() << " is publishing in topic "
717-
<< rdata->topicName() << "(keyed:" << rdata->topicKind() <<
718-
"), local writer publishes as keyed: " << wdata->topicKind());
719+
<< rdata->topicName() << "(keyed:"
720+
<< rdata->topicKind()
721+
<< "), local writer publishes as keyed: "
722+
<< wdata->topicKind());
719723

720724
reason.set(MatchingFailureMask::inconsistent_topic);
721725
return false;
@@ -733,16 +737,17 @@ bool EDP::valid_matching(
733737
//Means our writer is BE but the reader wants RE
734738
{
735739
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS (topic: " << rdata->topicName() << "):Remote Reader "
736-
<< rdata->guid() <<
737-
" is Reliable and local writer is BE ");
740+
<< rdata->guid()
741+
<< " is Reliable and local writer is BE ");
738742
incompatible_qos.set(fastdds::dds::RELIABILITY_QOS_POLICY_ID);
739743
}
740744

741745
if (wdata->m_qos.m_durability.kind < rdata->m_qos.m_durability.kind)
742746
{
743747
// TODO (MCC) Change log message
744748
EPROSIMA_LOG_WARNING(RTPS_EDP, "INCOMPATIBLE QOS (topic: " << rdata->topicName() << "):RemoteReader "
745-
<< rdata->guid() <<
749+
<< rdata->guid()
750+
<<
746751
" has TRANSIENT_LOCAL DURABILITY and we offer VOLATILE");
747752
incompatible_qos.set(fastdds::dds::DURABILITY_QOS_POLICY_ID);
748753
}
@@ -994,8 +999,8 @@ bool EDP::pairingReader(
994999
if (R->matched_writer_add(*wdatait))
9951000
{
9961001
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
997-
"WP:" << wdatait->guid() << " match R:" << R->getGuid() << ". RLoc:" <<
998-
wdatait->remote_locators());
1002+
"WP:" << wdatait->guid() << " match R:" << R->getGuid() << ". RLoc:"
1003+
<< wdatait->remote_locators());
9991004
//MATCHED AND ADDED CORRECTLY:
10001005
if (R->getListener() != nullptr)
10011006
{
@@ -1090,8 +1095,8 @@ bool EDP::pairingWriter(
10901095
if (W->matched_reader_add(*rdatait))
10911096
{
10921097
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1093-
"RP:" << rdatait->guid() << " match W:" << W->getGuid() << ". WLoc:" <<
1094-
rdatait->remote_locators());
1098+
"RP:" << rdatait->guid() << " match W:" << W->getGuid() << ". WLoc:"
1099+
<< rdatait->remote_locators());
10951100
//MATCHED AND ADDED CORRECTLY:
10961101
if (W->getListener() != nullptr)
10971102
{
@@ -1176,8 +1181,8 @@ bool EDP::pairing_reader_proxy_with_any_local_writer(
11761181
if (w.matched_reader_add(*rdata))
11771182
{
11781183
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1179-
"RP:" << rdata->guid() << " match W:" << w.getGuid() << ". RLoc:" <<
1180-
rdata->remote_locators());
1184+
"RP:" << rdata->guid() << " match W:" << w.getGuid() << ". RLoc:"
1185+
<< rdata->remote_locators());
11811186
//MATCHED AND ADDED CORRECTLY:
11821187
if (w.getListener() != nullptr)
11831188
{
@@ -1383,8 +1388,8 @@ bool EDP::pairing_writer_proxy_with_any_local_reader(
13831388
if (r.matched_writer_add(*wdata))
13841389
{
13851390
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
1386-
"WP:" << wdata->guid() << " match R:" << r.getGuid() << ". WLoc:" <<
1387-
wdata->remote_locators());
1391+
"WP:" << wdata->guid() << " match R:" << r.getGuid() << ". WLoc:"
1392+
<< wdata->remote_locators());
13881393
//MATCHED AND ADDED CORRECTLY:
13891394
if (r.getListener() != nullptr)
13901395
{

‎test/blackbox/common/BlackboxTestsDiscovery.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ TEST_P(Discovery, PubSubAsReliableHelloworldEndpointUserData)
10071007
}
10081008

10091009
//! Auxiliar method for discovering participants tests
1010-
template <typename ParticipantConfigurator>
1010+
template<typename ParticipantConfigurator>
10111011
static void discoverParticipantsTest(
10121012
bool avoid_multicast,
10131013
size_t n_participants,

‎test/blackbox/common/DDSBlackboxTestsDataReader.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ TEST(DDSDataReader, GetFirstUntakenInfoReturnsTheFirstValidChange)
329329
eprosima::fastdds::dds::SampleInfo info;
330330
for (size_t i = 0; i < 3; i++)
331331
{
332-
ASSERT_NE(eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK, reader.get_native_reader().get_first_untaken_info(
332+
ASSERT_NE(eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK,
333+
reader.get_native_reader().get_first_untaken_info(
333334
&info));
334335
std::this_thread::sleep_for(std::chrono::milliseconds(500));
335336
}

‎test/blackbox/common/DDSBlackboxTestsDataWriter.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ class TestsDataWriterQosCommonUtils
468468
qos.resource_limits().max_samples = 1000;
469469
qos.transport_priority().value = 1;
470470
qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS;
471-
qos.representation().m_value.push_back(eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);
471+
qos.representation().m_value.push_back(
472+
eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);
472473
qos.history().kind = eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS;
473474
qos.lifespan().duration = {5, 0};
474475
}

0 commit comments

Comments
 (0)