Skip to content

Commit 289caee

Browse files
committed
Refs #21129: Remove DiscoveryProtocol_t typedef
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent d9aa594 commit 289caee

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ The *Fast DDS* XML schema was duly updated to accommodate the new Discovery Serv
206206
207207
- The participant profile ``<builtin>`` tag contains a ``<discovery_config>`` tag where all discovery-related info is
208208
gathered. This new tag contains the following new XML child elements:
209-
- ``<discoveryProtocol>``: specifies the discovery type through the ``DiscoveryProtocol_t`` enumeration.
209+
- ``<discoveryProtocol>``: specifies the discovery type through the ``DiscoveryProtocol`` enumeration.
210210
- ``<discoveryServersList>``: specifies the server or servers to which a Client/Server connects.
211211
- ``<clientAnnouncementPeriod>``: specifies the time span between PDP metatraffic exchange.
212212

examples/HelloWorldExampleDS/HelloWorldPublisher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ bool HelloWorldPublisher::init(
9494
participant_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(ratt);
9595
}
9696

97-
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
97+
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
9898
participant_qos.wire_protocol().participant_id = 2;
9999
participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
100100
participant_qos.name("Participant_pub");

examples/HelloWorldExampleDS/HelloWorldServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool HelloWorldServer::init(
4242

4343
DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT;
4444

45-
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
45+
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
4646
std::istringstream iss("44.49.53.43.53.45.52.56.45.52.5F.31");
4747
iss >> participant_qos.wire_protocol().prefix;
4848
participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = c_TimeInfinite;

examples/HelloWorldExampleDS/HelloWorldSubscriber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bool HelloWorldSubscriber::init(
9090
participant_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(ratt);
9191
}
9292

93-
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
93+
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
9494
participant_qos.wire_protocol().participant_id = 3;
9595
participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
9696
participant_qos.name("Participant_sub");

src/DiscoveryServerManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,8 @@ void DiscoveryServerManager::loadClient(
10041004

10051005
// we must assert that DiscoveryProtocol is CLIENT
10061006

1007-
if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::CLIENT &&
1008-
dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SUPER_CLIENT)
1007+
if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::CLIENT &&
1008+
dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SUPER_CLIENT)
10091009
{
10101010
LOG_ERROR(
10111011
"DiscoveryServerManager::loadClient try to create a client with an incompatible profile: " <<
@@ -1277,7 +1277,7 @@ void DiscoveryServerManager::loadSimple(
12771277
}
12781278

12791279
// we must assert that DiscoveryProtocol is CLIENT
1280-
if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SIMPLE)
1280+
if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SIMPLE)
12811281
{
12821282
LOG_ERROR(
12831283
"DiscoveryServerManager::loadSimple try to create a simple participant with an incompatible profile: " <<

0 commit comments

Comments
 (0)