Skip to content

Commit e996d49

Browse files
elianalfelianalf
committed
Refs #21129: Remove typedef ParticipantFilteringFlags_t
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 83dfa07 commit e996d49

13 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎include/fastdds/rtps/attributes/RTPSParticipantAttributes.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ inline std::ostream& operator <<(
130130
}
131131

132132
//! Filtering flags when discovering participants
133-
typedef enum ParticipantFilteringFlags : uint32_t
133+
enum ParticipantFilteringFlags : uint32_t
134134
{
135135
NO_FILTER = 0,
136136
FILTER_DIFFERENT_HOST = 0x1,
137137
FILTER_DIFFERENT_PROCESS = 0x2,
138138
FILTER_SAME_PROCESS = 0x4
139-
} ParticipantFilteringFlags_t;
139+
};
140140

141141
#define BUILTIN_DATA_MAX_SIZE 512
142142

@@ -280,7 +280,7 @@ class DiscoverySettings
280280
eprosima::fastdds::rtps::RemoteServerList_t m_DiscoveryServers;
281281

282282
//! Filtering participants out depending on location
283-
ParticipantFilteringFlags_t ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER;
283+
ParticipantFilteringFlags ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER;
284284

285285
DiscoverySettings() = default;
286286

‎src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ ParticipantProxyData* PDPSimple::createParticipantProxyData(
198198
std::unique_lock<std::recursive_mutex> lock(*getMutex());
199199

200200
// decide if we dismiss the participant using the ParticipantFilteringFlags
201-
const ParticipantFilteringFlags_t& flags = m_discovery.discovery_config.ignoreParticipantFlags;
201+
const ParticipantFilteringFlags& flags = m_discovery.discovery_config.ignoreParticipantFlags;
202202
const GUID_t& remote = participant_data.m_guid;
203203
const GUID_t& local = getLocalParticipantProxyData()->m_guid;
204204
bool is_same_host = local.is_on_same_host_as(remote);
@@ -212,7 +212,7 @@ ParticipantProxyData* PDPSimple::createParticipantProxyData(
212212
return nullptr;
213213
}
214214

215-
if (flags != ParticipantFilteringFlags_t::NO_FILTER)
215+
if (flags != ParticipantFilteringFlags::NO_FILTER)
216216
{
217217
if (!is_same_host)
218218
{

‎src/cpp/xmlparser/XMLElementParser.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3969,7 +3969,7 @@ XMLP_ret XMLParser::getXMLEnum(
39693969

39703970
XMLP_ret XMLParser::getXMLEnum(
39713971
tinyxml2::XMLElement* elem,
3972-
ParticipantFilteringFlags_t* e,
3972+
ParticipantFilteringFlags* e,
39733973
uint8_t /*ident*/)
39743974
{
39753975
/*
@@ -4013,19 +4013,19 @@ XMLP_ret XMLParser::getXMLEnum(
40134013

40144014
if (flag == FILTER_DIFFERENT_HOST )
40154015
{
4016-
newflags |= ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST;
4016+
newflags |= ParticipantFilteringFlags::FILTER_DIFFERENT_HOST;
40174017
}
40184018
else if (flag == FILTER_DIFFERENT_PROCESS )
40194019
{
4020-
newflags |= ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS;
4020+
newflags |= ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS;
40214021
}
40224022
else if (flag == FILTER_SAME_PROCESS )
40234023
{
4024-
newflags |= ParticipantFilteringFlags_t::FILTER_SAME_PROCESS;
4024+
newflags |= ParticipantFilteringFlags::FILTER_SAME_PROCESS;
40254025
}
40264026
}
40274027

4028-
*e = static_cast<ParticipantFilteringFlags_t>(newflags);
4028+
*e = static_cast<ParticipantFilteringFlags>(newflags);
40294029

40304030
return XMLP_ret::XML_OK;
40314031
}

‎src/cpp/xmlparser/XMLParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ class XMLParser
630630

631631
static XMLP_ret getXMLEnum(
632632
tinyxml2::XMLElement* elem,
633-
rtps::ParticipantFilteringFlags_t* e,
633+
rtps::ParticipantFilteringFlags* e,
634634
uint8_t ident);
635635

636636
static XMLP_ret getXMLRemoteServer(

‎test/blackbox/api/dds-pim/PubSubReader.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ class PubSubReader
13581358
}
13591359

13601360
PubSubReader& ignore_participant_flags(
1361-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t flags)
1361+
eprosima::fastdds::rtps::ParticipantFilteringFlags flags)
13621362
{
13631363
participant_qos_.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = flags;
13641364
return *this;

‎test/blackbox/common/BlackboxTestsDiscovery.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,9 +1306,9 @@ TEST_P(Discovery, AsymmeticIgnoreParticipantFlags)
13061306
// When the announcements of this participant arrive to p2, a single DATA(p) should be sent back.
13071307
// No other traffic is expected, since it will take place through intraprocess.
13081308
PubSubReader<HelloWorldPubSubType> p1(TEST_TOPIC_NAME);
1309-
p1.ignore_participant_flags(static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags_t>(
1310-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST |
1311-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS));
1309+
p1.ignore_participant_flags(static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags>(
1310+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST |
1311+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS));
13121312
p1.init();
13131313
EXPECT_TRUE(p1.isInitialized());
13141314

‎test/blackbox/common/DDSBlackboxTestsStatistics.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ void test_discovery_topic_physical_data(
192192

193193
// Avoid discovery of participants external to the test
194194
pqos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags =
195-
static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags_t>(
196-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST |
197-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS);
195+
static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags>(
196+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST |
197+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS);
198198

199199
// Configure physical properties according to test case
200200
switch (test_kind)

‎test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ inline std::ostream& operator <<(
129129
}
130130

131131
//! Filtering flags when discovering participants
132-
typedef enum ParticipantFilteringFlags : uint32_t
132+
enum ParticipantFilteringFlags : uint32_t
133133
{
134134
NO_FILTER = 0,
135135
FILTER_DIFFERENT_HOST = 0x1,
136136
FILTER_DIFFERENT_PROCESS = 0x2,
137137
FILTER_SAME_PROCESS = 0x4
138-
} ParticipantFilteringFlags_t;
138+
};
139139

140140
#define BUILTIN_DATA_MAX_SIZE 512
141141

@@ -279,7 +279,7 @@ class DiscoverySettings
279279
eprosima::fastdds::rtps::RemoteServerList_t m_DiscoveryServers;
280280

281281
//! Filtering participants out depending on location
282-
ParticipantFilteringFlags_t ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER;
282+
ParticipantFilteringFlags ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER;
283283

284284
DiscoverySettings() = default;
285285

‎test/unittest/dds/publisher/DataWriterTests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@ TEST(DataWriterTests, get_guid)
393393

394394
DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT;
395395
participant_qos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags =
396-
static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags_t>(
397-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST |
398-
eprosima::fastdds::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS);
396+
static_cast<eprosima::fastdds::rtps::ParticipantFilteringFlags>(
397+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST |
398+
eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS);
399399

400400
DomainParticipant* listener_participant =
401401
DomainParticipantFactory::get_instance()->create_participant(0, participant_qos,

‎test/unittest/dds/subscriber/DataReaderTests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,9 @@ TEST_F(DataReaderTests, get_guid)
618618

619619
DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT;
620620
participant_qos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags =
621-
static_cast<ParticipantFilteringFlags_t>(
622-
ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST |
623-
ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS);
621+
static_cast<ParticipantFilteringFlags>(
622+
ParticipantFilteringFlags::FILTER_DIFFERENT_HOST |
623+
ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS);
624624

625625
DomainParticipant* listener_participant =
626626
DomainParticipantFactory::get_instance()->create_participant(

0 commit comments

Comments
 (0)