From b002c1d975a2caa81cdde1c30a562962ffdc31f4 Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Mon, 3 Jun 2024 07:53:14 +0200 Subject: [PATCH] Migrate BuiltinEndpoints defines to variables (#4851) * Refs #20707: Migrate BuiltinEndpoints defines to namespaced constexpr Signed-off-by: eduponz * Refs #20707: Make private additional constants Signed-off-by: eduponz * Refs #20707: Update versions.md Signed-off-by: eduponz * Refs #20707: Apply Eliana's suggestions Signed-off-by: eduponz * Refs #20707: Rename ParticipantProxyData.h to ParticipantProxyData.hpp Signed-off-by: eduponz * Refs #20707: Uncrustify Signed-off-by: eduponz * Refs #20707: Exclude MockAccessControlPlugin.h from uncrustify Signed-off-by: eduponz * Refs #20707: Fix uncrustify issue in ParticipantDiscoveryInfo.h Signed-off-by: eduponz --------- Signed-off-by: eduponz --- .../rtps/builtin/data/BuiltinEndpoints.hpp | 58 +++++++++++-------- ...ntProxyData.h => ParticipantProxyData.hpp} | 11 ++-- .../participant/ParticipantDiscoveryInfo.h | 5 +- .../type_lookup_service/TypeLookupManager.cpp | 23 ++++---- .../type_lookup_service/TypeLookupManager.hpp | 4 ++ .../fastdds/domain/DomainParticipantImpl.cpp | 2 +- src/cpp/fastdds/publisher/DataWriterImpl.cpp | 2 +- src/cpp/rtps/builtin/BuiltinProtocols.cpp | 4 +- .../builtin/data/ParticipantProxyData.cpp | 2 +- .../rtps/builtin/discovery/endpoint/EDP.cpp | 2 +- .../builtin/discovery/endpoint/EDPClient.cpp | 2 +- .../builtin/discovery/endpoint/EDPServer.hpp | 2 +- .../builtin/discovery/endpoint/EDPSimple.cpp | 43 +++++++------- .../discovery/endpoint/EDPSimpleListeners.cpp | 2 +- .../builtin/discovery/endpoint/EDPStatic.cpp | 2 +- .../DS/PDPSecurityInitiatorListener.hpp | 2 +- .../builtin/discovery/participant/PDP.cpp | 29 ++++++---- .../discovery/participant/PDPClient.cpp | 2 +- .../discovery/participant/PDPListener.h | 2 +- .../discovery/participant/PDPServer.cpp | 2 +- .../discovery/participant/PDPSimple.cpp | 34 ++++++----- .../participant/timedevent/DSClientEvent.cpp | 2 +- .../participant/timedevent/DServerEvent.cpp | 2 +- src/cpp/rtps/builtin/liveliness/WLP.cpp | 27 ++++----- .../builtin/liveliness/{WLP.h => WLP.hpp} | 11 ++-- .../rtps/builtin/liveliness/WLPListener.cpp | 2 +- .../rtps/network/utils/external_locators.cpp | 2 +- .../rtps/network/utils/external_locators.hpp | 2 +- src/cpp/rtps/network/utils/netmask_filter.cpp | 2 +- .../rtps/participant/RTPSParticipantImpl.cpp | 4 +- src/cpp/rtps/reader/StatefulReader.cpp | 2 +- src/cpp/rtps/reader/StatelessReader.cpp | 2 +- src/cpp/rtps/security/SecurityManager.cpp | 2 +- src/cpp/rtps/security/SecurityManager.h | 2 +- src/cpp/rtps/writer/StatefulWriter.cpp | 2 +- src/cpp/rtps/writer/StatelessWriter.cpp | 2 +- .../security/accesscontrol/Permissions.cpp | 2 +- src/cpp/security/authentication/PKIDH.cpp | 2 +- .../common/DDSBlackboxTestsDiscovery.cpp | 2 +- .../EDP/rtps/builtin/discovery/endpoint/EDP.h | 2 +- .../rtps/builtin/discovery/participant/PDP.h | 2 +- .../builtin/discovery/participant/PDPSimple.h | 2 +- ...ntProxyData.h => ParticipantProxyData.hpp} | 8 +-- .../rtps/participant/RTPSParticipant.h | 2 +- .../rtps/security/MockAccessControlPlugin.h | 8 ++- .../builtin/liveliness/{WLP.h => WLP.hpp} | 8 +-- .../rtps/network/utils/external_locators.hpp | 2 +- .../builtin/BuiltinDataSerializationTests.cpp | 2 +- test/unittest/rtps/discovery/PDPTests.cpp | 4 +- test/unittest/rtps/security/SecurityTests.hpp | 2 +- .../accesscontrol/AccessControlTests.cpp | 2 +- .../AuthenticationPluginTests.hpp | 2 +- versions.md | 1 + 53 files changed, 197 insertions(+), 157 deletions(-) rename include/fastdds/rtps/builtin/data/{ParticipantProxyData.h => ParticipantProxyData.hpp} (95%) rename src/cpp/rtps/builtin/liveliness/{WLP.h => WLP.hpp} (98%) rename test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/{ParticipantProxyData.h => ParticipantProxyData.hpp} (92%) rename test/mock/rtps/WLP/rtps/builtin/liveliness/{WLP.h => WLP.hpp} (93%) diff --git a/include/fastdds/rtps/builtin/data/BuiltinEndpoints.hpp b/include/fastdds/rtps/builtin/data/BuiltinEndpoints.hpp index 4c9408e79e1..85b113f567f 100644 --- a/include/fastdds/rtps/builtin/data/BuiltinEndpoints.hpp +++ b/include/fastdds/rtps/builtin/data/BuiltinEndpoints.hpp @@ -19,29 +19,39 @@ #ifndef FASTDDS_RTPS_BUILTIN_DATA__BUILTINENDPOINTS_HPP #define FASTDDS_RTPS_BUILTIN_DATA__BUILTINENDPOINTS_HPP -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER (0x00000001 << 0) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR (0x00000001 << 1) -#define DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER (0x00000001 << 2) -#define DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR (0x00000001 << 3) -#define DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER (0x00000001 << 4) -#define DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR (0x00000001 << 5) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_PROXY_ANNOUNCER (0x00000001 << 6) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_PROXY_DETECTOR (0x00000001 << 7) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_STATE_ANNOUNCER (0x00000001 << 8) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_STATE_DETECTOR (0x00000001 << 9) -#define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER (0x00000001 << 10) -#define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER (0x00000001 << 11) -#define BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER (0x00000001 << 12) -#define BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER (0x00000001 << 13) -#define BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER (0x00000001 << 14) -#define BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER (0x00000001 << 15) -#define DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER (0x00000001 << 16) -#define DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR (0x00000001 << 17) -#define DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER (0x00000001 << 18) -#define DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR (0x00000001 << 19) -#define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER (0x00000001 << 20) -#define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER (0x00000001 << 21) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER (0x00000001 << 26) -#define DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR (0x00000001 << 27) +#include + +namespace eprosima { +namespace fastdds { +namespace rtps { + +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER = 0x00000001 << 0; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR = 0x00000001 << 1; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER = 0x00000001 << 2; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR = 0x00000001 << 3; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER = 0x00000001 << 4; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR = 0x00000001 << 5; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_PROXY_ANNOUNCER = 0x00000001 << 6; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_PROXY_DETECTOR = 0x00000001 << 7; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_STATE_ANNOUNCER = 0x00000001 << 8; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_STATE_DETECTOR = 0x00000001 << 9; +constexpr uint32_t BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER = 0x00000001 << 10; +constexpr uint32_t BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER = 0x00000001 << 11; +constexpr uint32_t BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER = 0x00000001 << 12; +constexpr uint32_t BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER = 0x00000001 << 13; +constexpr uint32_t BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER = 0x00000001 << 14; +constexpr uint32_t BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER = 0x00000001 << 15; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER = 0x00000001 << 16; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR = 0x00000001 << 17; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER = 0x00000001 << 18; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR = 0x00000001 << 19; +constexpr uint32_t BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER = 0x00000001 << 20; +constexpr uint32_t BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER = 0x00000001 << 21; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER = 0x00000001 << 26; +constexpr uint32_t DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR = 0x00000001 << 27; + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima #endif // FASTDDS_RTPS_BUILTIN_DATA__BUILTINENDPOINTS_HPP diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.h b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp similarity index 95% rename from include/fastdds/rtps/builtin/data/ParticipantProxyData.h rename to include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp index 24c1260b7de..e2b1987d732 100644 --- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.h +++ b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp @@ -13,12 +13,12 @@ // limitations under the License. /** - * @file ParticipantProxyData.h + * @file ParticipantProxyData.hpp * */ -#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ -#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ +#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ +#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC @@ -33,9 +33,6 @@ #include #include -#define BUILTIN_PARTICIPANT_DATA_MAX_SIZE 100 -#define TYPELOOKUP_DATA_MAX_SIZE 5000 - namespace eprosima { namespace fastrtps { namespace rtps { @@ -237,4 +234,4 @@ class ParticipantProxyData #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ +#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h index 0e91d7f1388..515215c4aeb 100644 --- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h +++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h @@ -21,7 +21,7 @@ #define _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ #include -#include +#include namespace eprosima { namespace fastrtps { @@ -35,6 +35,8 @@ struct ParticipantDiscoveryInfo { //!Enum DISCOVERY_STATUS, four different status for discovered participants. //!@ingroup RTPS_MODULE + // *INDENT-OFF* eduponz: Does not understand the #if correctly and ends up removing the ; + // at the end of the enum, which does not build. #if defined(_WIN32) enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else @@ -47,6 +49,7 @@ struct ParticipantDiscoveryInfo DROPPED_PARTICIPANT, IGNORED_PARTICIPANT }; + // *INDENT-ON* ParticipantDiscoveryInfo( const ParticipantProxyData& data) diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp index a85b1d635bd..fae42314fea 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp @@ -26,7 +26,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -159,7 +160,7 @@ bool TypeLookupManager::assign_remote_endpoints( EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "for RTPSParticipant: " << pdata.m_guid); - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; if (auxendp != 0 && builtin_request_reader_ != nullptr) { @@ -170,7 +171,7 @@ bool TypeLookupManager::assign_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; if (auxendp != 0 && builtin_reply_reader_ != nullptr) { @@ -181,7 +182,7 @@ bool TypeLookupManager::assign_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; if (auxendp != 0 && builtin_request_writer_ != nullptr) { @@ -191,7 +192,7 @@ bool TypeLookupManager::assign_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; if (auxendp != 0 && builtin_reply_writer_ != nullptr) { @@ -213,8 +214,8 @@ void TypeLookupManager::remove_remote_endpoints( uint32_t endp = pdata->m_availableBuiltinEndpoints; uint32_t partdet = endp; uint32_t auxendp = endp; - partdet &= DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; //Habria que quitar esta linea que comprueba si tiene PDP. - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; + partdet &= rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; //Habria que quitar esta linea que comprueba si tiene PDP. + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; if ((auxendp != 0 || partdet != 0) && builtin_request_reader_ != nullptr) { @@ -224,7 +225,7 @@ void TypeLookupManager::remove_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; if ((auxendp != 0 || partdet != 0) && builtin_reply_reader_ != nullptr) { @@ -234,7 +235,7 @@ void TypeLookupManager::remove_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; if ((auxendp != 0 || partdet != 0) && builtin_request_writer_ != nullptr) { @@ -244,7 +245,7 @@ void TypeLookupManager::remove_remote_endpoints( } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; + auxendp &= rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; if ((auxendp != 0 || partdet != 0) && builtin_reply_writer_ != nullptr) { @@ -497,7 +498,7 @@ bool TypeLookupManager::create_endpoints() HistoryAttributes hatt; hatt.initialReservedCaches = 20; hatt.maximumReservedCaches = 1000; - hatt.payloadMaxSize = TYPELOOKUP_DATA_MAX_SIZE; + hatt.payloadMaxSize = TypeLookupManager::typelookup_data_max_size; WriterAttributes watt; watt.endpoint.unicastLocatorList = builtin_protocols_->m_metatrafficUnicastLocatorList; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp index a9b90c92bb3..e98d08f2003 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp @@ -20,6 +20,7 @@ #ifndef _FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE_TYPE_LOOKUP_MANAGER_HPP_ #define _FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE_TYPE_LOOKUP_MANAGER_HPP_ +#include #include #include #include @@ -436,6 +437,9 @@ class TypeLookupManager //! Collection of all SampleIdentity and the TypeIdentfierWithSize it originated from, hashed by its SampleIdentity. std::unordered_map async_get_type_requests_; + + //! Max size of TypeLookup messages. + static constexpr uint32_t typelookup_data_max_size = 5000; }; } /* namespace builtin */ diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp index 8135b7aa131..58617cd1705 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index bab6d97bf82..c328b6c3107 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp index ca8f7515da6..6f30a3afde8 100644 --- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp +++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include using namespace eprosima::fastrtps; diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp index d6e6692c113..d5cab4a3a13 100644 --- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp +++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp index d7ed1848de0..7c6e07cda88 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp index ae1c6a04882..8d07ace5157 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp index c8363b23beb..fd90f073a98 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp @@ -21,7 +21,7 @@ #define _FASTDDS_RTPS_EDPSERVER2_H_ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#include +#include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 3998fc49d09..8e18d9e8578 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -28,7 +28,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -778,7 +779,7 @@ void EDPSimple::assignRemoteEndpoints( temp_writer_proxy_data->m_qos.m_reliability.kind = RELIABLE_RELIABILITY_QOS; auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; if (auxendp != 0 && publications_reader_.first != nullptr) //Exist Pub Writer and i have pub reader { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Pub Writer to my Pub Reader"); @@ -787,7 +788,7 @@ void EDPSimple::assignRemoteEndpoints( publications_reader_.first->matched_writer_add(*temp_writer_proxy_data); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; if (auxendp != 0 && publications_writer_.first != nullptr) //Exist Pub Detector { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Pub Reader to my Pub Writer"); @@ -795,7 +796,7 @@ void EDPSimple::assignRemoteEndpoints( publications_writer_.first->matched_reader_add(*temp_reader_proxy_data); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; if (auxendp != 0 && subscriptions_reader_.first != nullptr) //Exist Pub Announcer { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Writer to my Sub Reader"); @@ -804,7 +805,7 @@ void EDPSimple::assignRemoteEndpoints( subscriptions_reader_.first->matched_writer_add(*temp_writer_proxy_data); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; if (auxendp != 0 && subscriptions_writer_.first != nullptr) //Exist Pub Announcer { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Reader to my Sub Writer"); @@ -814,7 +815,7 @@ void EDPSimple::assignRemoteEndpoints( #if HAVE_SECURITY auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; if (auxendp != 0 && publications_secure_reader_.first != nullptr && assign_secure_endpoints) { temp_writer_proxy_data->guid().entityId = sedp_builtin_publications_secure_writer; @@ -830,7 +831,7 @@ void EDPSimple::assignRemoteEndpoints( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; if (auxendp != 0 && publications_secure_writer_.first != nullptr && assign_secure_endpoints) { temp_reader_proxy_data->guid().entityId = sedp_builtin_publications_secure_reader; @@ -844,7 +845,7 @@ void EDPSimple::assignRemoteEndpoints( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; if (auxendp != 0 && subscriptions_secure_reader_.first != nullptr && assign_secure_endpoints) { temp_writer_proxy_data->guid().entityId = sedp_builtin_subscriptions_secure_writer; @@ -860,7 +861,7 @@ void EDPSimple::assignRemoteEndpoints( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; if (auxendp != 0 && subscriptions_secure_writer_.first != nullptr && assign_secure_endpoints) { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Reader to my Sub Writer"); @@ -889,21 +890,21 @@ void EDPSimple::removeRemoteEndpoints( uint32_t endp = pdata->m_availableBuiltinEndpoints; uint32_t auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; if (auxendp != 0 && publications_reader_.first != nullptr) //Exist Pub Writer and i have pub reader { tmp_guid.entityId = c_EntityId_SEDPPubWriter; publications_reader_.first->matched_writer_remove(tmp_guid); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; if (auxendp != 0 && publications_writer_.first != nullptr) //Exist Pub Detector { tmp_guid.entityId = c_EntityId_SEDPPubReader; publications_writer_.first->matched_reader_remove(tmp_guid); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; if (auxendp != 0 && subscriptions_reader_.first != nullptr) //Exist Pub Announcer { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Writer to my Sub Reader"); @@ -911,7 +912,7 @@ void EDPSimple::removeRemoteEndpoints( subscriptions_reader_.first->matched_writer_remove(tmp_guid); } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; if (auxendp != 0 && subscriptions_writer_.first != nullptr) //Exist Pub Announcer { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Reader to my Sub Writer"); @@ -921,7 +922,7 @@ void EDPSimple::removeRemoteEndpoints( #if HAVE_SECURITY auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; if (auxendp != 0 && publications_secure_reader_.first != nullptr) { tmp_guid.entityId = sedp_builtin_publications_secure_writer; @@ -933,7 +934,7 @@ void EDPSimple::removeRemoteEndpoints( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; if (auxendp != 0 && publications_secure_writer_.first != nullptr) { tmp_guid.entityId = sedp_builtin_publications_secure_reader; @@ -945,7 +946,7 @@ void EDPSimple::removeRemoteEndpoints( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; if (auxendp != 0 && subscriptions_secure_reader_.first != nullptr) { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Writer to my Sub Reader"); @@ -957,7 +958,7 @@ void EDPSimple::removeRemoteEndpoints( } } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; if (auxendp != 0 && subscriptions_secure_writer_.first != nullptr) { EPROSIMA_LOG_INFO(RTPS_EDP, "Adding SEDP Sub Reader to my Sub Writer"); @@ -977,7 +978,7 @@ bool EDPSimple::areRemoteEndpointsMatched( uint32_t endp = pdata->m_availableBuiltinEndpoints; uint32_t auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; if (auxendp != 0 && publications_reader_.first != nullptr) //Exist Pub Writer and I have Pub Reader { GUID_t wguid; @@ -991,7 +992,7 @@ bool EDPSimple::areRemoteEndpointsMatched( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; if (auxendp != 0 && publications_writer_.first != nullptr) //Exist Pub Detector { GUID_t rguid; @@ -1005,7 +1006,7 @@ bool EDPSimple::areRemoteEndpointsMatched( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; if (auxendp != 0 && subscriptions_reader_.first != nullptr) //Exist Pub Announcer { GUID_t wguid; @@ -1019,7 +1020,7 @@ bool EDPSimple::areRemoteEndpointsMatched( } auxendp = endp; - auxendp &= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; + auxendp &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; if (auxendp != 0 && subscriptions_writer_.first != nullptr) //Exist Pub Announcer { GUID_t rguid; diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp index bccfeff942c..66feb870f72 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp index ea17bcdb8a5..15f2b7bcc3b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp index 25e70ac2f7f..dfab8a1a6d0 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp index 94588faabb3..5e8bd017811 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp @@ -26,7 +26,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -42,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -241,22 +242,30 @@ void PDP::initializeParticipantProxyData( if (attributes.builtin.use_WriterLivelinessProtocol) { - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; #if HAVE_SECURITY if (mp_RTPSParticipant->is_secure()) { - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; } #endif // if HAVE_SECURITY } - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER; - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; - participant_data->m_availableBuiltinEndpoints |= BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER; #if HAVE_SECURITY if (mp_RTPSParticipant->is_secure()) diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp index ebd4fe3e0d7..87eb052ac72 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h index 6b4d6195f79..ae103f56fc2 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h @@ -22,7 +22,7 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC #include -#include +#include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp index 883f62b6f85..550d3b6e237 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp index a6e4bdd4110..1e5312a9248 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp @@ -21,7 +21,8 @@ #include #include -#include +#include +#include #include #include #include @@ -38,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -110,30 +111,35 @@ void PDPSimple::initializeParticipantProxyData( if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP. use_PublicationWriterANDSubscriptionReader) { - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; + participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_ANNOUNCER; + participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR; } if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP. use_PublicationReaderANDSubscriptionWriter) { - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; + participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER; } #if HAVE_SECURITY if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP. enable_builtin_secure_publications_writer_and_subscriptions_reader) { - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR; } if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP. enable_builtin_secure_subscriptions_writer_and_publications_reader) { - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; - participant_data->m_availableBuiltinEndpoints |= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER; + participant_data->m_availableBuiltinEndpoints |= + fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR; } #endif // if HAVE_SECURITY } @@ -627,8 +633,8 @@ void PDPSimple::match_pdp_remote_endpoints( // Default to values for non-secure endpoints auto reliability_kind = BEST_EFFORT_RELIABILITY_QOS; - uint32_t pdp_reader_mask = DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; - uint32_t pdp_writer_mask = DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER; + uint32_t pdp_reader_mask = fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; + uint32_t pdp_writer_mask = fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER; EntityId_t reader_entity_id = c_EntityId_SPDPReader; EntityId_t writer_entity_id = c_EntityId_SPDPWriter; RTPSReader* reader = endpoints->reader.reader_; @@ -640,8 +646,8 @@ void PDPSimple::match_pdp_remote_endpoints( { auto secure_endpoints = static_cast(builtin_endpoints_.get()); reliability_kind = RELIABLE_RELIABILITY_QOS; - pdp_reader_mask = DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR; - pdp_writer_mask = DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER; + pdp_reader_mask = fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR; + pdp_writer_mask = fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER; reader_entity_id = c_EntityId_spdp_reliable_participant_secure_reader; writer_entity_id = c_EntityId_spdp_reliable_participant_secure_writer; reader = secure_endpoints->secure_reader.reader_; diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp index f52d6d8d5b4..d11d0e35363 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp index 284b2efad03..2ed27e6b299 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index e8dc9f5b7e3..57a1bb7d708 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -17,13 +17,14 @@ * */ -#include +#include #include #include #include -#include +#include +#include #include #include #include @@ -35,8 +36,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -503,7 +504,7 @@ bool WLP::assignRemoteEndpoints( temp_reader_proxy_data_.m_qos.m_durability.kind = TRANSIENT_LOCAL_DURABILITY_QOS; temp_reader_proxy_data_.m_qos.m_reliability.kind = RELIABLE_RELIABILITY_QOS; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; if (auxendp != 0 && this->mp_builtinReader != nullptr) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Adding remote writer to my local Builtin Reader"); @@ -512,7 +513,7 @@ bool WLP::assignRemoteEndpoints( mp_builtinReader->matched_writer_add(temp_writer_proxy_data_); } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; if (auxendp != 0 && this->mp_builtinWriter != nullptr) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Adding remote reader to my local Builtin Writer"); @@ -522,7 +523,7 @@ bool WLP::assignRemoteEndpoints( #if HAVE_SECURITY auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; if (auxendp != 0 && this->mp_builtinReaderSecure != nullptr && assign_secure_endpoints) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Adding remote writer to my local Builtin Secure Reader"); @@ -538,7 +539,7 @@ bool WLP::assignRemoteEndpoints( } } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; if (auxendp != 0 && this->mp_builtinWriterSecure != nullptr && assign_secure_endpoints) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Adding remote reader to my local Builtin Secure Writer"); @@ -568,8 +569,8 @@ void WLP::removeRemoteEndpoints( uint32_t endp = pdata->m_availableBuiltinEndpoints; uint32_t partdet = endp; uint32_t auxendp = endp; - partdet &= DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; //Habria que quitar esta linea que comprueba si tiene PDP. - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; + partdet &= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER; if ((auxendp != 0 || partdet != 0) && this->mp_builtinReader != nullptr) { @@ -578,7 +579,7 @@ void WLP::removeRemoteEndpoints( mp_builtinReader->matched_writer_remove(tmp_guid); } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER; if ((auxendp != 0 || partdet != 0) && this->mp_builtinWriter != nullptr) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Removing remote reader from my local Builtin Writer"); @@ -588,7 +589,7 @@ void WLP::removeRemoteEndpoints( #if HAVE_SECURITY auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER; if ((auxendp != 0 || partdet != 0) && this->mp_builtinReaderSecure != nullptr) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Removing remote writer from my local Builtin Secure Reader"); @@ -600,7 +601,7 @@ void WLP::removeRemoteEndpoints( } } auxendp = endp; - auxendp &= BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; + auxendp &= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER; if ((auxendp != 0 || partdet != 0) && this->mp_builtinWriterSecure != nullptr) { EPROSIMA_LOG_INFO(RTPS_LIVELINESS, "Removing remote reader from my local Builtin Secure Writer"); @@ -898,7 +899,7 @@ bool WLP::send_liveliness_message( CacheChange_t* change = writer->new_change( []() -> uint32_t { - return BUILTIN_PARTICIPANT_DATA_MAX_SIZE; + return WLP::builtin_participant_data_max_size; }, ALIVE, instance); diff --git a/src/cpp/rtps/builtin/liveliness/WLP.h b/src/cpp/rtps/builtin/liveliness/WLP.hpp similarity index 98% rename from src/cpp/rtps/builtin/liveliness/WLP.h rename to src/cpp/rtps/builtin/liveliness/WLP.hpp index 0b014ef14e8..718394b856f 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.h +++ b/src/cpp/rtps/builtin/liveliness/WLP.hpp @@ -13,14 +13,15 @@ // limitations under the License. /** - * @file WLP.h + * @file WLP.hpp * */ -#ifndef _FASTDDS_RTPS_WLP_H_ -#define _FASTDDS_RTPS_WLP_H_ +#ifndef _FASTDDS_RTPS_WLP_HPP_ +#define _FASTDDS_RTPS_WLP_HPP_ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC +#include #include #include @@ -303,6 +304,8 @@ class WLP #if HAVE_SECURITY std::shared_ptr secure_payload_pool_; #endif // if HAVE_SECURITY + + static constexpr uint32_t builtin_participant_data_max_size = 100; }; } /* namespace rtps */ @@ -310,4 +313,4 @@ class WLP } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#endif /* _FASTDDS_RTPS_WLP_H_ */ +#endif /* _FASTDDS_RTPS_WLP_HPP_ */ diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp index 2e624076c16..15092fb9282 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp index 5d4045e1b32..f5626da63b6 100644 --- a/src/cpp/rtps/network/utils/external_locators.cpp +++ b/src/cpp/rtps/network/utils/external_locators.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/network/utils/external_locators.hpp b/src/cpp/rtps/network/utils/external_locators.hpp index fc86d863d97..e0dcbcce61a 100644 --- a/src/cpp/rtps/network/utils/external_locators.hpp +++ b/src/cpp/rtps/network/utils/external_locators.hpp @@ -20,7 +20,7 @@ #define _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_ #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/network/utils/netmask_filter.cpp b/src/cpp/rtps/network/utils/netmask_filter.cpp index d145f6c19e9..ab89046261c 100644 --- a/src/cpp/rtps/network/utils/netmask_filter.cpp +++ b/src/cpp/rtps/network/utils/netmask_filter.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index 88b11aba403..fafc4765233 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp index 40089ade895..5b0a18f61bb 100644 --- a/src/cpp/rtps/reader/StatefulReader.cpp +++ b/src/cpp/rtps/reader/StatefulReader.cpp @@ -31,7 +31,7 @@ #include "reader_utils.hpp" #include "rtps/RTPSDomainImpl.hpp" #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp index eb31ad8ee3d..b9d55382392 100644 --- a/src/cpp/rtps/reader/StatelessReader.cpp +++ b/src/cpp/rtps/reader/StatelessReader.cpp @@ -30,7 +30,7 @@ #include "reader_utils.hpp" #include "rtps/RTPSDomainImpl.hpp" #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp index 7d35cbfff6d..7469e4bfa4d 100644 --- a/src/cpp/rtps/security/SecurityManager.cpp +++ b/src/cpp/rtps/security/SecurityManager.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h index aab008fda78..e0178ecc660 100644 --- a/src/cpp/rtps/security/SecurityManager.h +++ b/src/cpp/rtps/security/SecurityManager.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp index 10cff88eab3..8a7761d755c 100644 --- a/src/cpp/rtps/writer/StatefulWriter.cpp +++ b/src/cpp/rtps/writer/StatefulWriter.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp index 7305819b2f6..7e787a5bb76 100644 --- a/src/cpp/rtps/writer/StatelessWriter.cpp +++ b/src/cpp/rtps/writer/StatelessWriter.cpp @@ -31,7 +31,7 @@ #include "../flowcontrol/FlowController.hpp" #include -#include +#include #include #include #include diff --git a/src/cpp/security/accesscontrol/Permissions.cpp b/src/cpp/security/accesscontrol/Permissions.cpp index cc9fa7b24d0..ccb7ae940fe 100644 --- a/src/cpp/security/accesscontrol/Permissions.cpp +++ b/src/cpp/security/accesscontrol/Permissions.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp index ddb94494dac..afc998b7745 100644 --- a/src/cpp/security/authentication/PKIDH.cpp +++ b/src/cpp/security/authentication/PKIDH.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp index d3685f3531b..9c2ef1e5ef9 100644 --- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h index 6500c7ed343..18ef14f614c 100644 --- a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h +++ b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h @@ -20,7 +20,7 @@ #define _FASTDDS_RTPS_EDP_H_ #include -#include +#include #include #include #include diff --git a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h index 0c25b76b274..292e098b35a 100644 --- a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h +++ b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h index 9b476996230..ddc15450aeb 100644 --- a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h +++ b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.h b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp similarity index 92% rename from test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.h rename to test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp index 44d68aa0157..ed1c15b0f5d 100644 --- a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.h +++ b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp @@ -13,10 +13,10 @@ // limitations under the License. /** - * @file ParticipantProxyData.h + * @file ParticipantProxyData.hpp */ -#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ -#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ +#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ +#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ #include #include @@ -81,4 +81,4 @@ class ParticipantProxyData } // namespace fastrtps } // namespace eprosima -#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ +#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h index 5daf5ec711c..e97476a4824 100644 --- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h +++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h index 061c52b9b18..bdf746a5d64 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -37,6 +37,7 @@ class MockAccessControlPlugin : public AccessControl using AccessPermissionsHandle = HandleImpl; + // *INDENT-OFF* Uncrustify makes a mess with MOCK_METHOD macros MOCK_METHOD(PermissionsHandle*, validate_local_permissions, ( Authentication & auth_plugin, const IdentityHandle& identity, @@ -45,7 +46,7 @@ class MockAccessControlPlugin : public AccessControl SecurityException & exception), (override)); MOCK_METHOD(bool, get_permissions_token, ( - PermissionsToken * *permissions_token, + PermissionsToken** permissions_token, const PermissionsHandle& handle, SecurityException & exception), (override)); @@ -54,7 +55,7 @@ class MockAccessControlPlugin : public AccessControl SecurityException & exception), (override)); MOCK_METHOD(bool, get_permissions_credential_token, ( - PermissionsCredentialToken * *permissions_credential_token, + PermissionsCredentialToken** permissions_credential_token, const PermissionsHandle& handle, SecurityException & exception), (override)); @@ -127,6 +128,7 @@ class MockAccessControlPlugin : public AccessControl const std::vector& partitions, EndpointSecurityAttributes & attributes, SecurityException & exception), (override)); + // *INDENT-ON* PermissionsHandle* get_permissions_handle( SecurityException&) override diff --git a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.h b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp similarity index 93% rename from test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.h rename to test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp index 290d4b5ce57..3ac0d688dce 100644 --- a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.h +++ b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp @@ -13,12 +13,12 @@ // limitations under the License. /** - * @file WLP.h + * @file WLP.hpp * */ -#ifndef _FASTDDS_RTPS_WLP_H_ -#define _FASTDDS_RTPS_WLP_H_ +#ifndef _FASTDDS_RTPS_WLP_HPP_ +#define _FASTDDS_RTPS_WLP_HPP_ #include #include @@ -70,4 +70,4 @@ class WLP } /* namespace fastrtps */ } /* namespace eprosima */ -#endif /* _FASTDDS_RTPS_WLP_H_ */ +#endif /* _FASTDDS_RTPS_WLP_HPP_ */ diff --git a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp index 2b1640e2ed4..d238c92a18a 100644 --- a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp +++ b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp @@ -20,7 +20,7 @@ #define _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_ #include -#include +#include #include #include #include diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp index 067aa533a8c..5f99cf952ae 100644 --- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp +++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/unittest/rtps/discovery/PDPTests.cpp b/test/unittest/rtps/discovery/PDPTests.cpp index 32729b1a808..7e04d245017 100644 --- a/test/unittest/rtps/discovery/PDPTests.cpp +++ b/test/unittest/rtps/discovery/PDPTests.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -63,7 +64,8 @@ class TesterPDPEndpoints : public fastdds::rtps::PDPEndpoints fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override { - return DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; + return fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | + fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; } const std::unique_ptr& main_listener() const override diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp index a0e4499e553..2e15efdc839 100644 --- a/test/unittest/rtps/security/SecurityTests.hpp +++ b/test/unittest/rtps/security/SecurityTests.hpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/test/unittest/security/accesscontrol/AccessControlTests.cpp b/test/unittest/security/accesscontrol/AccessControlTests.cpp index b5edec5c9ec..780da7a05e7 100644 --- a/test/unittest/security/accesscontrol/AccessControlTests.cpp +++ b/test/unittest/security/accesscontrol/AccessControlTests.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include #include diff --git a/test/unittest/security/authentication/AuthenticationPluginTests.hpp b/test/unittest/security/authentication/AuthenticationPluginTests.hpp index 31482ae88aa..3ffa460cc4e 100644 --- a/test/unittest/security/authentication/AuthenticationPluginTests.hpp +++ b/test/unittest/security/authentication/AuthenticationPluginTests.hpp @@ -19,7 +19,7 @@ // Include first necessary mocks #include -#include +#include #include #include diff --git a/versions.md b/versions.md index abcb4d452e8..5433b5cd59a 100644 --- a/versions.md +++ b/versions.md @@ -36,6 +36,7 @@ Forthcoming * Configuration example that condenses multiple QoS examples. Multiple configurations allowed through argument parsing. * Removed `TypeConsistencyQos` from DataReader, and included `TypeConsistencyEnforcementQosPolicy` and `DataRepresentationQosPolicy` * Added new `flow_controller_descriptor_list` XML configuration, remove `ThroughtputController`. +* Migrate `#define`s within `BuiltinEndpoints.hpp` to namespaced `constexpr` variables. Version 2.14.0 --------------