Skip to content

Commit 7820c73

Browse files
elianalfelianalf
committed
Refs #21129: Remove DiscoveryProtocol_t typedef
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 7f2e7bc commit 7820c73

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎code/DDSCodeTester.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ void dds_discovery_examples()
11411141
using Locator_t = eprosima::fastdds::rtps::Locator_t;
11421142
using RemoteServerAttributes = eprosima::fastdds::rtps::RemoteServerAttributes;
11431143
using IPLocator = eprosima::fastdds::rtps::IPLocator;
1144-
using DiscoveryProtocol_t = eprosima::fastdds::rtps::DiscoveryProtocol_t;
1144+
using DiscoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol;
11451145
using ParticipantFilteringFlags_t = eprosima::fastdds::rtps::ParticipantFilteringFlags_t;
11461146
{
11471147
//SET-DISCOVERY-CALLBACKS
@@ -1161,7 +1161,7 @@ void dds_discovery_examples()
11611161
DomainParticipantQos pqos;
11621162

11631163
pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1164-
DiscoveryProtocol_t::SIMPLE;
1164+
DiscoveryProtocol::SIMPLE;
11651165
//!--
11661166
}
11671167
{
@@ -1246,13 +1246,13 @@ void dds_discovery_examples()
12461246
DomainParticipantQos pqos;
12471247

12481248
pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1249-
DiscoveryProtocol_t::CLIENT;
1249+
DiscoveryProtocol::CLIENT;
12501250
pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1251-
DiscoveryProtocol_t::SUPER_CLIENT;
1251+
DiscoveryProtocol::SUPER_CLIENT;
12521252
pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1253-
DiscoveryProtocol_t::SERVER;
1253+
DiscoveryProtocol::SERVER;
12541254
pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1255-
DiscoveryProtocol_t::BACKUP;
1255+
DiscoveryProtocol::BACKUP;
12561256
//!--
12571257
}
12581258
{
@@ -1372,7 +1372,7 @@ void dds_discovery_examples()
13721372

13731373
// Set participant as SERVER
13741374
server_qos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1375-
DiscoveryProtocol_t::SERVER;
1375+
DiscoveryProtocol::SERVER;
13761376

13771377
// Set SERVER's GUID prefix
13781378
std::istringstream("44.53.00.5f.45.50.52.4f.53.49.4d.41") >> server_qos.wire_protocol().prefix;
@@ -1415,7 +1415,7 @@ void dds_discovery_examples()
14151415

14161416
// Set participant as CLIENT
14171417
client_qos.wire_protocol().builtin.discovery_config.discoveryProtocol =
1418-
DiscoveryProtocol_t::CLIENT;
1418+
DiscoveryProtocol::CLIENT;
14191419

14201420
// Set SERVER's GUID prefix
14211421
RemoteServerAttributes remote_server_att;
@@ -4375,7 +4375,7 @@ void dds_qos_examples()
43754375
std::istringstream("72.61.73.70.66.61.72.6d.74.65.73.74") >> wire_protocol.prefix;
43764376
//Configure Builtin Attributes
43774377
wire_protocol.builtin.discovery_config.discoveryProtocol =
4378-
eprosima::fastdds::rtps::DiscoveryProtocol_t::SERVER;
4378+
eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
43794379
//Add locator to unicast list
43804380
eprosima::fastdds::rtps::Locator_t server_locator;
43814381
eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, "192.168.10.57");
@@ -6059,7 +6059,7 @@ void dds_usecase_examples()
60596059
using Locator_t = eprosima::fastdds::rtps::Locator_t;
60606060
using RemoteServerAttributes = eprosima::fastdds::rtps::RemoteServerAttributes;
60616061
using IPLocator = eprosima::fastdds::rtps::IPLocator;
6062-
using DiscoveryProtocol_t = eprosima::fastdds::rtps::DiscoveryProtocol_t;
6062+
using DiscoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol;
60636063

60646064
{
60656065
//CONF_INITIAL_PEERS_BASIC
@@ -6093,7 +6093,7 @@ void dds_usecase_examples()
60936093
DomainParticipantQos qos;
60946094

60956095
// Configure the current participant as SERVER
6096-
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
6096+
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
60976097

60986098
// Define the listening locator to be on interface 192.168.10.57 and port 56542
60996099
Locator_t server_locator;
@@ -6111,7 +6111,7 @@ void dds_usecase_examples()
61116111
DomainParticipantQos qos;
61126112

61136113
// Configure the current participant as CLIENT
6114-
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
6114+
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
61156115

61166116
// Define a locator for the SERVER Participant on address 192.168.10.57 and port 56542
61176117
Locator_t remote_server_locator;
@@ -6138,7 +6138,7 @@ void dds_usecase_examples()
61386138

61396139
// Configure participant_1 as SERVER listening on the previous locator
61406140
DomainParticipantQos server_1_qos;
6141-
server_1_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
6141+
server_1_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
61426142
std::istringstream("75.63.2D.73.76.72.63.6C.6E.74.2D.31") >> server_1_qos.wire_protocol().prefix;
61436143
server_1_qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(server_locator_1);
61446144

@@ -6149,7 +6149,7 @@ void dds_usecase_examples()
61496149

61506150
// Configure participant_2 as SERVER listening on the previous locator
61516151
DomainParticipantQos server_2_qos;
6152-
server_2_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
6152+
server_2_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
61536153
std::istringstream("75.63.2D.73.76.72.63.6C.6E.74.2D.32") >> server_2_qos.wire_protocol().prefix;
61546154
server_2_qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(server_locator_2);
61556155
//!--
@@ -6177,7 +6177,7 @@ void dds_usecase_examples()
61776177

61786178
// Configure the current participant as CLIENT connecting to the SERVERS at the previous locators
61796179
DomainParticipantQos client_qos;
6180-
client_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
6180+
client_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
61816181
client_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(remote_server_attr_1);
61826182
client_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(remote_server_attr_2);
61836183
//!--
@@ -6192,7 +6192,7 @@ void dds_usecase_examples()
61926192
IPLocator::setIPv4(server_locator, "192.168.10.60");
61936193
server_locator.port = 56543;
61946194

6195-
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
6195+
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
61966196
std::istringstream("75.63.2D.73.76.72.63.6C.6E.74.2D.31") >> qos.wire_protocol().prefix;
61976197
qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(server_locator);
61986198

@@ -6218,7 +6218,7 @@ void dds_usecase_examples()
62186218
IPLocator::setIPv4(server_locator, "192.168.10.54");
62196219
server_locator.port = 56541;
62206220

6221-
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
6221+
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
62226222
std::istringstream("75.63.2D.73.76.72.63.6C.6E.74.2D.33") >> qos.wire_protocol().prefix;
62236223
qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(server_locator);
62246224

@@ -7343,7 +7343,7 @@ void tcp_use_cases()
73437343

73447344
// Configure the current participant as SERVER
73457345
qos.wire_protocol().builtin.discovery_config.discoveryProtocol =
7346-
eprosima::fastdds::rtps::DiscoveryProtocol_t::SERVER;
7346+
eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
73477347

73487348
// Add custom user transport with TCP port 12345
73497349
auto data_transport = std::make_shared<eprosima::fastdds::rtps::TCPv4TransportDescriptor>();
@@ -7369,7 +7369,7 @@ void tcp_use_cases()
73697369

73707370
// Configure the current participant as SERVER
73717371
qos.wire_protocol().builtin.discovery_config.discoveryProtocol =
7372-
eprosima::fastdds::rtps::DiscoveryProtocol_t::CLIENT;
7372+
eprosima::fastdds::rtps::DiscoveryProtocol::CLIENT;
73737373

73747374
// Add custom user transport with TCP port 0 (automatic port assignation)
73757375
auto data_transport = std::make_shared<eprosima::fastdds::rtps::TCPv4TransportDescriptor>();

‎docs/03-exports/aliases-api.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@
855855

856856
.. |DiscoverySettings-api| replace:: :cpp:class:`DiscoverySettings <eprosima::fastdds::rtps::DiscoverySettings>`
857857
.. |leaseDuration_announcementperiod| replace:: :cpp:member:`leaseDuration_announcementperiod <eprosima::fastdds::rtps::DiscoverySettings::leaseDuration_announcementperiod>`
858-
.. |DiscoveryProtocol_t| replace:: :cpp:member:`DiscoveryProtocol_t <eprosima::fastdds::rtps::DiscoverySettings::DiscoveryProtocol_t>`
858+
.. |DiscoveryProtocol| replace:: :cpp:member:`DiscoveryProtocol <eprosima::fastdds::rtps::DiscoverySettings::DiscoveryProtocol>`
859859
.. |ParticipantFilteringFlags_t| replace:: :cpp:member:`ParticipantFilteringFlags_t <eprosima::fastdds::rtps::DiscoverySettings::ParticipantFilteringFlags_t>`
860860
.. |discoveryProtocol| replace:: :cpp:member:`discoveryProtocol <eprosima::fastdds::rtps::DiscoverySettings::discoveryProtocol>`
861861
.. |m_DiscoveryServers| replace:: :cpp:member:`m_DiscoveryServers <eprosima::fastdds::rtps::DiscoverySettings::m_DiscoveryServers>`

0 commit comments

Comments
 (0)