Refs #21129: Remove DiscoveryProtocol_t typedef

Signed-off-by: elianalf <[email protected]>
eProsima · Jun 13, 2024 · 289caee · 289caee
1 parent d9aa594
commit 289caee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -206,7 +206,7 @@ The *Fast DDS* XML schema was duly updated to accommodate the new Discovery Serv
 
 -   The participant profile ``<builtin>`` tag contains a ``<discovery_config>`` tag where all discovery-related info is
     gathered. This new tag contains the following new XML child elements:
-	- ``<discoveryProtocol>``: specifies the discovery type through the ``DiscoveryProtocol_t`` enumeration.
+	- ``<discoveryProtocol>``: specifies the discovery type through the ``DiscoveryProtocol`` enumeration.
 	- ``<discoveryServersList>``: specifies the server or servers to which a Client/Server connects.
 	- ``<clientAnnouncementPeriod>``: specifies the time span between PDP metatraffic exchange.
 

diff --git a/examples/HelloWorldExampleDS/HelloWorldPublisher.cpp b/examples/HelloWorldExampleDS/HelloWorldPublisher.cpp
@@ -94,7 +94,7 @@ bool HelloWorldPublisher::init(
         participant_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(ratt);
     }
 
-    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     participant_qos.wire_protocol().participant_id = 2;
     participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
     participant_qos.name("Participant_pub");

diff --git a/examples/HelloWorldExampleDS/HelloWorldServer.cpp b/examples/HelloWorldExampleDS/HelloWorldServer.cpp
@@ -42,7 +42,7 @@ bool HelloWorldServer::init(
 
     DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT;
 
-    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
+    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
     std::istringstream iss("44.49.53.43.53.45.52.56.45.52.5F.31");
     iss >> participant_qos.wire_protocol().prefix;
     participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = c_TimeInfinite;

diff --git a/examples/HelloWorldExampleDS/HelloWorldSubscriber.cpp b/examples/HelloWorldExampleDS/HelloWorldSubscriber.cpp
@@ -90,7 +90,7 @@ bool HelloWorldSubscriber::init(
         participant_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(ratt);
     }
 
-    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     participant_qos.wire_protocol().participant_id = 3;
     participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
     participant_qos.name("Participant_sub");

diff --git a/src/DiscoveryServerManager.cpp b/src/DiscoveryServerManager.cpp
@@ -1004,8 +1004,8 @@ void DiscoveryServerManager::loadClient(
 
     // we must assert that DiscoveryProtocol is CLIENT
 
-    if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::CLIENT &&
-            dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SUPER_CLIENT)
+    if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::CLIENT &&
+            dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SUPER_CLIENT)
     {
         LOG_ERROR(
             "DiscoveryServerManager::loadClient try to create a client with an incompatible profile: " <<
@@ -1277,7 +1277,7 @@ void DiscoveryServerManager::loadSimple(
         }
 
         // we must assert that DiscoveryProtocol is CLIENT
-        if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SIMPLE)
+        if (dpQOS.wire_protocol().builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SIMPLE)
         {
             LOG_ERROR(
                 "DiscoveryServerManager::loadSimple try to create a simple participant with an incompatible profile: " <<