Refs #21129: Remove DiscoveryProtocol_t typedef

elianalf · elianalf · commit 7cafd40df6e8 · 2024-06-14T11:15:45.000+02:00
Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
@@ -152,7 +152,7 @@ bool HelloWorldPublisher::init(
 
     // Set participant as DS CLIENT
     pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
-            eprosima::fastdds::rtps::DiscoveryProtocol_t::CLIENT;
+            eprosima::fastdds::rtps::DiscoveryProtocol::CLIENT;
 
     // Set SERVER's GUID prefix
     RemoteServerAttributes remote_server_att;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
@@ -179,7 +179,7 @@ bool DiscoveryServer::init(
 
     // Set participant as SERVER
     pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
-            eprosima::fastdds::rtps::DiscoveryProtocol_t::SERVER;
+            eprosima::fastdds::rtps::DiscoveryProtocol::SERVER;
 
     // Set SERVER's GUID prefix
     pqos.wire_protocol().prefix = get_discovery_server_guid_from_id(server_id);
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
@@ -155,7 +155,7 @@ bool HelloWorldSubscriber::init(
 
     // Set participant as DS CLIENT
     pqos.wire_protocol().builtin.discovery_config.discoveryProtocol =
-            eprosima::fastdds::rtps::DiscoveryProtocol_t::CLIENT;
+            eprosima::fastdds::rtps::DiscoveryProtocol::CLIENT;
 
     // Set SERVER's GUID prefix
     RemoteServerAttributes remote_server_att;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
@@ -46,7 +46,7 @@ bool HelloWorldPublisher::init()
 
     //CREATE THE PARTICIPANT
     DomainParticipantQos pqos;
-    pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SIMPLE;
+    pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE;
     pqos.wire_protocol().builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol = true;
     pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true;
     pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationWriterANDSubscriptionReader = true;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
@@ -45,7 +45,7 @@ bool HelloWorldSubscriber::init()
 
     //CREATE THE PARTICIPANT
     DomainParticipantQos pqos;
-    pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SIMPLE;
+    pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE;
     pqos.wire_protocol().builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol = true;
     pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true;
     pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationWriterANDSubscriptionReader = true;
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
@@ -52,7 +52,7 @@ bool TestReaderSocket::init(
 {
     //CREATE PARTICIPANT
     RTPSParticipantAttributes PParam;
-    PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::NONE;
+    PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::NONE;
     PParam.builtin.use_WriterLivelinessProtocol = false;
     mp_participant = RTPSDomain::createParticipant(0, PParam);
     if (mp_participant == nullptr)
diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@@ -67,7 +67,7 @@ namespace fastdds {
 namespace rtps {
 
 //! PDP subclass choice
-typedef enum DiscoveryProtocol
+enum class DiscoveryProtocol
 {
     NONE,
     /*!<
@@ -94,7 +94,7 @@ typedef enum DiscoveryProtocol
     SUPER_CLIENT  /*!< The participant will behave as a client concerning all internal behaviour.
                      Remote servers will treat it as a server and will share every discovery information. */
 
-} DiscoveryProtocol_t;
+};
 
 inline std::ostream& operator <<(
         std::ostream& output,
@@ -236,7 +236,7 @@ class DiscoverySettings
 public:
 
     //! Chosen discovery protocol
-    DiscoveryProtocol_t discoveryProtocol = DiscoveryProtocol_t::SIMPLE;
+    DiscoveryProtocol discoveryProtocol = DiscoveryProtocol::SIMPLE;
 
     /**
      * If set to true, SimpleEDP would be used.
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
@@ -224,8 +224,8 @@ RTPSParticipant* RTPSDomainImpl::createParticipant(
     // Above constructors create the sender resources. If a given listening port cannot be allocated an iterative
     // mechanism will allocate another by default. Change the default listening port is unacceptable for
     // discovery server Participant.
-    if ((PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol_t::SERVER
-            || PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol_t::BACKUP)
+    if ((PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::SERVER
+            || PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::BACKUP)
             && pimpl->did_mutation_took_place_on_meta(
                 PParam.builtin.metatrafficMulticastLocatorList,
                 PParam.builtin.metatrafficUnicastLocatorList))
@@ -261,7 +261,7 @@ RTPSParticipant* RTPSDomainImpl::createParticipant(
     }
 
     // Check the environment file in case it was modified during participant creation leading to a missed callback.
-    if ((PParam.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::CLIENT) &&
+    if ((PParam.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::CLIENT) &&
             instance->file_watch_handle_)
     {
         pimpl->environment_file_has_changed();
@@ -543,7 +543,7 @@ RTPSParticipant* RTPSDomainImpl::clientServerEnvironmentCreationOverride(
         RTPSParticipantListener* listen)
 {
     // Check the specified discovery protocol: if other than simple it has priority over ros environment variable
-    if (att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SIMPLE)
+    if (att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SIMPLE)
     {
         EPROSIMA_LOG_INFO(DOMAIN, "Detected non simple discovery protocol attributes."
                 << " Ignoring auto default client-server setup.");
@@ -653,13 +653,13 @@ RTPSParticipant* RTPSDomainImpl::clientServerEnvironmentCreationOverride(
             << "Trying to create client with the default server setup: "
             << client_att.builtin.discovery_config.m_DiscoveryServers);
 
-    client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     // RemoteServerAttributes already fill in above
 
     // Check if the client must become a super client
     if (ros_super_client_env())
     {
-        client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SUPER_CLIENT;
+        client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SUPER_CLIENT;
     }
 
     RTPSParticipant* part = createParticipant(domain_id, enabled, client_att, listen);
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -87,38 +87,38 @@ bool BuiltinProtocols::initBuiltinProtocols(
     // PDP
     switch (m_att.discovery_config.discoveryProtocol)
     {
-        case DiscoveryProtocol_t::NONE:
+        case DiscoveryProtocol::NONE:
             EPROSIMA_LOG_WARNING(RTPS_PDP, "No participant discovery protocol specified");
             return true;
 
-        case DiscoveryProtocol_t::SIMPLE:
+        case DiscoveryProtocol::SIMPLE:
             mp_PDP = new PDPSimple(this, allocation);
             break;
 
-        case DiscoveryProtocol_t::EXTERNAL:
+        case DiscoveryProtocol::EXTERNAL:
             EPROSIMA_LOG_ERROR(RTPS_PDP, "Flag only present for debugging purposes");
             return false;
 
-        case DiscoveryProtocol_t::CLIENT:
+        case DiscoveryProtocol::CLIENT:
             mp_PDP = new fastdds::rtps::PDPClient(this, allocation);
             break;
 
-        case DiscoveryProtocol_t::SERVER:
+        case DiscoveryProtocol::SERVER:
             mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT_LOCAL);
             break;
 
 #if HAVE_SQLITE3
-        case DiscoveryProtocol_t::BACKUP:
+        case DiscoveryProtocol::BACKUP:
             mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT);
             break;
 #endif // if HAVE_SQLITE3
 
-        case DiscoveryProtocol_t::SUPER_CLIENT:
+        case DiscoveryProtocol::SUPER_CLIENT:
             mp_PDP = new fastdds::rtps::PDPClient(this, allocation, true);
             break;
 
         default:
-            EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol_t specified.");
+            EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol specified.");
             return false;
     }
 
@@ -314,7 +314,7 @@ void BuiltinProtocols::announceRTPSParticipantState()
     {
         mp_PDP->announceParticipantState(false);
     }
-    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)
+    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)
     {
         EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");
     }
@@ -329,7 +329,7 @@ void BuiltinProtocols::stopRTPSParticipantAnnouncement()
     {
         mp_PDP->stopParticipantAnnouncement();
     }
-    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)
+    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)
     {
         EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");
     }
@@ -343,7 +343,7 @@ void BuiltinProtocols::resetRTPSParticipantAnnouncement()
     {
         mp_PDP->resetParticipantAnnouncement();
     }
-    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)
+    else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)
     {
         EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");
     }
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -107,10 +107,10 @@ void PDPClient::initializeParticipantProxyData(
 
     if (
         getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol
-        != DiscoveryProtocol_t::CLIENT
+        != DiscoveryProtocol::CLIENT
         &&
         getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol
-        != DiscoveryProtocol_t::SUPER_CLIENT    )
+        != DiscoveryProtocol::SUPER_CLIENT    )
     {
         EPROSIMA_LOG_ERROR(RTPS_PDP, "Using a PDP client object with another user's settings");
     }
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -538,10 +538,10 @@ void PDPServer::initializeParticipantProxyData(
     PDP::initializeParticipantProxyData(participant_data);
 
     if (getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol !=
-            DiscoveryProtocol_t::SERVER
+            DiscoveryProtocol::SERVER
             &&
             getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol !=
-            DiscoveryProtocol_t::BACKUP)
+            DiscoveryProtocol::BACKUP)
     {
         EPROSIMA_LOG_ERROR(RTPS_PDP_SERVER, "Using a PDP Server object with another user's settings");
     }
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
@@ -81,7 +81,7 @@ class PDPServer : public fastdds::rtps::PDP
 
     /**
      * @brief Checks if a backup file needs to be restored for
-     * DiscoveryProtocol_t::BACKUP before enabling the Participant Discovery Protocol
+     * DiscoveryProtocol::BACKUP before enabling the Participant Discovery Protocol
      */
     void pre_enable_actions() override;
 
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -2768,8 +2768,8 @@ void RTPSParticipantImpl::environment_file_has_changed()
 {
     RTPSParticipantAttributes patt = m_att;
     // Only if it is a server/backup or a client override
-    if (DiscoveryProtocol_t::SERVER == m_att.builtin.discovery_config.discoveryProtocol ||
-            DiscoveryProtocol_t::BACKUP == m_att.builtin.discovery_config.discoveryProtocol ||
+    if (DiscoveryProtocol::SERVER == m_att.builtin.discovery_config.discoveryProtocol ||
+            DiscoveryProtocol::BACKUP == m_att.builtin.discovery_config.discoveryProtocol ||
             client_override_)
     {
         if (load_environment_server_info(patt.builtin.discovery_config.m_DiscoveryServers))
diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp
@@ -3922,7 +3922,7 @@ XMLP_ret XMLParser::getXMLEnum(
 
 XMLP_ret XMLParser::getXMLEnum(
         tinyxml2::XMLElement* elem,
-        DiscoveryProtocol_t* e,
+        DiscoveryProtocol* e,
         uint8_t /*ident*/)
 {
     /*
@@ -3953,12 +3953,12 @@ XMLP_ret XMLParser::getXMLEnum(
     }
 
     if (!get_element_enum_value(text.c_str(), *e,
-            NONE, DiscoveryProtocol_t::NONE,
-            SIMPLE, DiscoveryProtocol_t::SIMPLE,
-            CLIENT, DiscoveryProtocol_t::CLIENT,
-            SERVER, DiscoveryProtocol_t::SERVER,
-            BACKUP, DiscoveryProtocol_t::BACKUP,
-            SUPER_CLIENT, DiscoveryProtocol_t::SUPER_CLIENT))
+            NONE, DiscoveryProtocol::NONE,
+            SIMPLE, DiscoveryProtocol::SIMPLE,
+            CLIENT, DiscoveryProtocol::CLIENT,
+            SERVER, DiscoveryProtocol::SERVER,
+            BACKUP, DiscoveryProtocol::BACKUP,
+            SUPER_CLIENT, DiscoveryProtocol::SUPER_CLIENT))
     {
         EPROSIMA_LOG_ERROR(XMLPARSER, "Node '" << RTPS_PDP_TYPE << "' with bad content");
         return XMLP_ret::XML_ERROR;
diff --git a/src/cpp/xmlparser/XMLParser.h b/src/cpp/xmlparser/XMLParser.h
@@ -620,7 +620,7 @@ class XMLParser
 
     static XMLP_ret getXMLEnum(
             tinyxml2::XMLElement* elem,
-            rtps::DiscoveryProtocol_t* e,
+            rtps::DiscoveryProtocol* e,
             uint8_t ident);
 
     static XMLP_ret getXMLList(
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -112,7 +112,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP)
     PubSubParticipant<HelloWorldPubSubType> server_1(0u, 0u, 0u, 0u);
     // Set participant as server
     WireProtocolConfigQos server_1_qos;
-    server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
+    server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
     // Generate random GUID prefix
     srand(static_cast<unsigned>(time(nullptr)));
     GuidPrefix_t server_1_prefix;
@@ -134,7 +134,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP)
     PubSubParticipant<HelloWorldPubSubType> server_2(0u, 0u, 0u, 0u);
     // Set participant as server
     WireProtocolConfigQos server_2_qos;
-    server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
+    server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
     // Generate random GUID prefix
     GuidPrefix_t server_2_prefix = server_1_prefix;
     server_2_prefix.value[11]++;
@@ -152,7 +152,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP)
     PubSubParticipant<HelloWorldPubSubType> client(0u, 0u, 0u, 0u);
     // Set participant as client
     WireProtocolConfigQos client_qos;
-    client_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    client_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     // Connect to first server
     RemoteServerAttributes server_1_att;
     server_1_att.guidPrefix = server_1_prefix;
@@ -213,7 +213,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP)
     PubSubParticipant<HelloWorldPubSubType> server_1(0u, 0u, 0u, 0u);
     // Set participant as server
     WireProtocolConfigQos server_1_qos;
-    server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
+    server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
     // Generate random GUID prefix
     srand(static_cast<unsigned>(time(nullptr)));
     GuidPrefix_t server_1_prefix;
@@ -243,7 +243,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP)
     PubSubParticipant<HelloWorldPubSubType> server_2(0u, 0u, 0u, 0u);
     // Set participant as server
     WireProtocolConfigQos server_2_qos;
-    server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
+    server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER;
     // Generate random GUID prefix
     GuidPrefix_t server_2_prefix = server_1_prefix;
     server_2_prefix.value[11]++;
@@ -271,7 +271,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP)
     PubSubParticipant<HelloWorldPubSubType> client_1(0u, 0u, 0u, 0u);
     // Set participant as client
     WireProtocolConfigQos client_qos_1;
-    client_qos_1.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    client_qos_1.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     // Connect to first server
     RemoteServerAttributes server_1_att;
     server_1_att.guidPrefix = server_1_prefix;
@@ -290,7 +290,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP)
     PubSubParticipant<HelloWorldPubSubType> client_2(0u, 0u, 0u, 0u);
     // Set participant as client
     WireProtocolConfigQos client_qos_2;
-    client_qos_2.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT;
+    client_qos_2.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT;
     // Connect to first server
     client_qos_2.builtin.discovery_config.m_DiscoveryServers.push_back(server_1_att);
     auto descriptor_4 = std::make_shared<eprosima::fastdds::rtps::TCPv4TransportDescriptor>();
diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp
@@ -40,18 +40,18 @@ ParticipantModule::ParticipantModule(
 {
     if (discovery_protocol.compare(ParticipantType::SERVER) == 0)
     {
-        discovery_protocol_ = DiscoveryProtocol_t::SERVER;
+        discovery_protocol_ = DiscoveryProtocol::SERVER;
         std::istringstream server_guid_prefix_str(guid_prefix);
         server_guid_prefix_str >> server_guid_prefix_;
         unicast_metatraffic_port_ = atoi(unicast_metatraffic_port.c_str());
     }
     else if (discovery_protocol.compare(ParticipantType::CLIENT) == 0)
     {
-        discovery_protocol_ = DiscoveryProtocol_t::CLIENT;
+        discovery_protocol_ = DiscoveryProtocol::CLIENT;
     }
     else
     {
-        discovery_protocol_ = DiscoveryProtocol_t::SIMPLE;
+        discovery_protocol_ = DiscoveryProtocol::SIMPLE;
     }
 }
 
@@ -67,7 +67,7 @@ bool ParticipantModule::init()
 {
     DomainParticipantQos participant_qos;
     participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = discovery_protocol_;
-    if (DiscoveryProtocol_t::SERVER == discovery_protocol_)
+    if (DiscoveryProtocol::SERVER == discovery_protocol_)
     {
         participant_qos.wire_protocol().prefix = server_guid_prefix_;
         Locator_t locator_server;
diff --git a/test/dds/discovery/ParticipantModule.hpp b/test/dds/discovery/ParticipantModule.hpp
@@ -57,7 +57,7 @@ class ParticipantModule : public DomainParticipantListener
 
     unsigned int matched_ = 0;
     DomainParticipant* participant_ = nullptr;
-    DiscoveryProtocol_t discovery_protocol_;
+    DiscoveryProtocol discovery_protocol_;
     GuidPrefix_t server_guid_prefix_;
     uint32_t unicast_metatraffic_port_;
 };
diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp
diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp
diff --git a/test/unittest/xmlparser/wrapper/XMLParserTest.hpp b/test/unittest/xmlparser/wrapper/XMLParserTest.hpp
diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ bool TestReaderSocket::init(`
`52`	`52`	`{`
`53`	`53`	`//CREATE PARTICIPANT`
`54`	`54`	`RTPSParticipantAttributes PParam;`
`55`		`- PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::NONE;`
	`55`	`+ PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::NONE;`
`56`	`56`	`PParam.builtin.use_WriterLivelinessProtocol = false;`
`57`	`57`	`mp_participant = RTPSDomain::createParticipant(0, PParam);`
`58`	`58`	`if (mp_participant == nullptr)`
Original file line number	Diff line number	Diff line change
`@@ -87,38 +87,38 @@ bool BuiltinProtocols::initBuiltinProtocols(`
`87`	`87`	`// PDP`
`88`	`88`	`switch (m_att.discovery_config.discoveryProtocol)`
`89`	`89`	`{`
`90`		`- case DiscoveryProtocol_t::NONE:`
	`90`	`+ case DiscoveryProtocol::NONE:`
`91`	`91`	`EPROSIMA_LOG_WARNING(RTPS_PDP, "No participant discovery protocol specified");`
`92`	`92`	`return true;`
`93`	`93`
`94`		`- case DiscoveryProtocol_t::SIMPLE:`
	`94`	`+ case DiscoveryProtocol::SIMPLE:`
`95`	`95`	`mp_PDP = new PDPSimple(this, allocation);`
`96`	`96`	`break;`
`97`	`97`
`98`		`- case DiscoveryProtocol_t::EXTERNAL:`
	`98`	`+ case DiscoveryProtocol::EXTERNAL:`
`99`	`99`	`EPROSIMA_LOG_ERROR(RTPS_PDP, "Flag only present for debugging purposes");`
`100`	`100`	`return false;`
`101`	`101`
`102`		`- case DiscoveryProtocol_t::CLIENT:`
	`102`	`+ case DiscoveryProtocol::CLIENT:`
`103`	`103`	`mp_PDP = new fastdds::rtps::PDPClient(this, allocation);`
`104`	`104`	`break;`
`105`	`105`
`106`		`- case DiscoveryProtocol_t::SERVER:`
	`106`	`+ case DiscoveryProtocol::SERVER:`
`107`	`107`	`mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT_LOCAL);`
`108`	`108`	`break;`
`109`	`109`
`110`	`110`	`#if HAVE_SQLITE3`
`111`		`- case DiscoveryProtocol_t::BACKUP:`
	`111`	`+ case DiscoveryProtocol::BACKUP:`
`112`	`112`	`mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT);`
`113`	`113`	`break;`
`114`	`114`	`#endif // if HAVE_SQLITE3`
`115`	`115`
`116`		`- case DiscoveryProtocol_t::SUPER_CLIENT:`
	`116`	`+ case DiscoveryProtocol::SUPER_CLIENT:`
`117`	`117`	`mp_PDP = new fastdds::rtps::PDPClient(this, allocation, true);`
`118`	`118`	`break;`
`119`	`119`
`120`	`120`	`default:`
`121`		`- EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol_t specified.");`
	`121`	`+ EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol specified.");`
`122`	`122`	`return false;`
`123`	`123`	`}`
`124`	`124`
`@@ -314,7 +314,7 @@ void BuiltinProtocols::announceRTPSParticipantState()`
`314`	`314`	`{`
`315`	`315`	`mp_PDP->announceParticipantState(false);`
`316`	`316`	`}`
`317`		`- else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)`
	`317`	`+ else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)`
`318`	`318`	`{`
`319`	`319`	`EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");`
`320`	`320`	`}`
`@@ -329,7 +329,7 @@ void BuiltinProtocols::stopRTPSParticipantAnnouncement()`
`329`	`329`	`{`
`330`	`330`	`mp_PDP->stopParticipantAnnouncement();`
`331`	`331`	`}`
`332`		`- else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)`
	`332`	`+ else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)`
`333`	`333`	`{`
`334`	`334`	`EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");`
`335`	`335`	`}`
`@@ -343,7 +343,7 @@ void BuiltinProtocols::resetRTPSParticipantAnnouncement()`
`343`	`343`	`{`
`344`	`344`	`mp_PDP->resetParticipantAnnouncement();`
`345`	`345`	`}`
`346`		`- else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE)`
	`346`	`+ else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE)`
`347`	`347`	`{`
`348`	`348`	`EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call");`
`349`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ void PDPClient::initializeParticipantProxyData(`
`107`	`107`
`108`	`108`	`if (`
`109`	`109`	`getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol`
`110`		`- != DiscoveryProtocol_t::CLIENT`
	`110`	`+ != DiscoveryProtocol::CLIENT`
`111`	`111`	`&&`
`112`	`112`	`getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol`
`113`		`- != DiscoveryProtocol_t::SUPER_CLIENT )`
	`113`	`+ != DiscoveryProtocol::SUPER_CLIENT )`
`114`	`114`	`{`
`115`	`115`	`EPROSIMA_LOG_ERROR(RTPS_PDP, "Using a PDP client object with another user's settings");`
`116`	`116`	`}`