From e307ed6effd286c733117909628216a6c09be648 Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Tue, 12 Mar 2024 08:15:33 +0100 Subject: [PATCH] Migrate DLL API exporter and auto linkage to fastdds (#4500) * Refs #20569: Rename RTPS_DllAPI to FASTDDS_EXPORTED_API Signed-off-by: EduPonz * Refs #20569: Move fastrtps/fastrtps_dll.h to fastdds/fastdds_dll.hpp Signed-off-by: EduPonz * Refs #20569: Move fastrtps/eProsima_auto_link.h to fastdds/fastdds_auto_link.hpp Signed-off-by: EduPonz * Refs #20569: Uncrustify Signed-off-by: EduPonz --------- Signed-off-by: EduPonz --- .../dds/builtin/common/ReplyHeader.hpp | 2 +- .../dds/builtin/common/RequestHeader.hpp | 2 +- .../typelookup/common/TypeLookupTypes.hpp | 235 +- include/fastdds/dds/common/InstanceHandle.hpp | 4 +- include/fastdds/dds/core/Entity.hpp | 14 +- .../fastdds/dds/core/condition/Condition.hpp | 4 +- .../dds/core/condition/GuardCondition.hpp | 10 +- .../dds/core/condition/StatusCondition.hpp | 10 +- .../fastdds/dds/core/condition/WaitSet.hpp | 14 +- .../dds/core/policy/ParameterTypes.hpp | 6 +- .../fastdds/dds/core/policy/QosPolicies.hpp | 234 +- .../policy/ReaderDataLifecycleQosPolicy.hpp | 2 +- .../policy/WriterDataLifecycleQosPolicy.hpp | 2 +- .../fastdds/dds/core/status/StatusMask.hpp | 4 +- .../fastdds/dds/domain/DomainParticipant.hpp | 132 +- .../dds/domain/DomainParticipantFactory.hpp | 42 +- .../qos/DomainParticipantFactoryQos.hpp | 8 +- .../dds/domain/qos/DomainParticipantQos.hpp | 10 +- include/fastdds/dds/log/FileConsumer.hpp | 6 +- include/fastdds/dds/log/Log.hpp | 40 +- include/fastdds/dds/log/OStreamConsumer.hpp | 4 +- include/fastdds/dds/log/StdoutConsumer.hpp | 2 +- include/fastdds/dds/log/StdoutErrConsumer.hpp | 6 +- include/fastdds/dds/publisher/DataWriter.hpp | 78 +- .../dds/publisher/DataWriterListener.hpp | 2 +- include/fastdds/dds/publisher/Publisher.hpp | 54 +- .../dds/publisher/PublisherListener.hpp | 4 +- .../dds/publisher/qos/DataWriterQos.hpp | 152 +- .../dds/publisher/qos/PublisherQos.hpp | 6 +- .../fastdds/dds/publisher/qos/WriterQos.hpp | 12 +- include/fastdds/dds/subscriber/DataReader.hpp | 98 +- .../dds/subscriber/DataReaderListener.hpp | 20 +- .../fastdds/dds/subscriber/ReadCondition.hpp | 12 +- include/fastdds/dds/subscriber/Subscriber.hpp | 52 +- .../dds/subscriber/SubscriberListener.hpp | 8 +- .../dds/subscriber/qos/DataReaderQos.hpp | 146 +- .../fastdds/dds/subscriber/qos/ReaderQos.hpp | 10 +- .../dds/subscriber/qos/SubscriberQos.hpp | 6 +- .../dds/topic/ContentFilteredTopic.hpp | 14 +- include/fastdds/dds/topic/IContentFilter.hpp | 2 +- .../dds/topic/IContentFilterFactory.hpp | 2 +- include/fastdds/dds/topic/Topic.hpp | 14 +- include/fastdds/dds/topic/TopicDataType.hpp | 60 +- include/fastdds/dds/topic/TopicListener.hpp | 4 +- include/fastdds/dds/topic/TypeSupport.hpp | 50 +- include/fastdds/dds/topic/qos/TopicQos.hpp | 4 +- .../fastdds_auto_link.hpp} | 0 .../fastdds_dll.hpp} | 10 +- include/fastdds/rtps/Endpoint.h | 6 +- include/fastdds/rtps/RTPSDomain.h | 36 +- .../rtps/attributes/BuiltinTransports.hpp | 6 +- .../rtps/attributes/HistoryAttributes.h | 4 +- .../fastdds/rtps/attributes/PropertyPolicy.h | 32 +- .../attributes/RTPSParticipantAttributes.h | 6 +- .../rtps/attributes/ServerAttributes.h | 26 +- .../rtps/attributes/ThreadSettings.hpp | 4 +- .../rtps/builtin/data/ParticipantProxyData.h | 36 +- .../rtps/builtin/data/ReaderProxyData.h | 116 +- .../rtps/builtin/data/WriterProxyData.h | 118 +- include/fastdds/rtps/common/CDRMessage_t.h | 2 +- include/fastdds/rtps/common/CacheChange.h | 2 +- include/fastdds/rtps/common/ChangeKind_t.hpp | 4 +- include/fastdds/rtps/common/EntityId_t.hpp | 4 +- include/fastdds/rtps/common/FragmentNumber.h | 24 +- include/fastdds/rtps/common/Guid.h | 4 +- include/fastdds/rtps/common/GuidPrefix_t.hpp | 4 +- include/fastdds/rtps/common/InstanceHandle.h | 6 +- include/fastdds/rtps/common/Locator.h | 4 +- include/fastdds/rtps/common/LocatorList.hpp | 46 +- .../fastdds/rtps/common/LocatorWithMask.hpp | 7 +- include/fastdds/rtps/common/MatchingInfo.h | 49 +- include/fastdds/rtps/common/SampleIdentity.h | 2 +- include/fastdds/rtps/common/SequenceNumber.h | 4 +- .../fastdds/rtps/common/SerializedPayload.h | 4 +- include/fastdds/rtps/common/Time_t.h | 6 +- include/fastdds/rtps/common/Token.h | 234 +- include/fastdds/rtps/common/Types.h | 4 +- include/fastdds/rtps/common/WriteParams.h | 2 +- include/fastdds/rtps/exceptions/Exception.h | 154 +- .../rtps/flowcontrol/FlowControllerConsts.hpp | 6 +- .../ThroughputControllerDescriptor.h | 6 +- include/fastdds/rtps/history/History.h | 46 +- include/fastdds/rtps/history/ReaderHistory.h | 34 +- include/fastdds/rtps/history/WriterHistory.h | 32 +- .../participant/ParticipantDiscoveryInfo.h | 6 +- .../rtps/participant/RTPSParticipant.h | 4 +- .../participant/RTPSParticipantListener.h | 2 +- include/fastdds/rtps/reader/RTPSReader.h | 52 +- .../fastdds/rtps/reader/ReaderDiscoveryInfo.h | 4 +- include/fastdds/rtps/reader/ReaderListener.h | 2 +- .../security/exceptions/SecurityException.h | 72 +- .../rtps/transport/ChainingTransport.h | 60 +- .../transport/ChainingTransportDescriptor.h | 10 +- .../PortBasedTransportDescriptor.hpp | 24 +- .../transport/SocketTransportDescriptor.h | 12 +- .../rtps/transport/TCPTransportDescriptor.h | 10 +- .../rtps/transport/TCPv4TransportDescriptor.h | 8 +- .../rtps/transport/TCPv6TransportDescriptor.h | 8 +- .../transport/TransportDescriptorInterface.h | 24 +- .../rtps/transport/TransportInterface.h | 2 +- .../transport/TransportReceiverInterface.h | 2 +- .../rtps/transport/UDPTransportDescriptor.h | 10 +- .../rtps/transport/UDPv4TransportDescriptor.h | 8 +- .../rtps/transport/UDPv6TransportDescriptor.h | 8 +- .../network/AllowedNetworkInterface.hpp | 12 +- .../network/BlockedNetworkInterface.hpp | 12 +- .../transport/network/NetmaskFilterKind.hpp | 4 +- .../transport/network/NetworkInterface.hpp | 18 +- .../network/NetworkInterfaceWithFilter.hpp | 20 +- .../shared_mem/SharedMemTransportDescriptor.h | 32 +- .../transport/test_UDPv4TransportDescriptor.h | 12 +- include/fastdds/rtps/writer/RTPSWriter.h | 48 +- .../fastdds/rtps/writer/WriterDiscoveryInfo.h | 10 +- include/fastdds/rtps/writer/WriterListener.h | 2 +- .../dds/domain/DomainParticipant.hpp | 28 +- .../dds/publisher/qos/DataWriterQos.hpp | 4 +- .../dds/subscriber/qos/DataReaderQos.hpp | 4 +- include/fastrtps/Domain.h | 38 +- include/fastrtps/participant/Participant.h | 123 +- include/fastrtps/publisher/Publisher.h | 4 +- .../fastrtps/publisher/PublisherListener.h | 2 +- include/fastrtps/subscriber/SampleInfo.h | 4 +- include/fastrtps/subscriber/Subscriber.h | 2 +- .../fastrtps/subscriber/SubscriberListener.h | 4 +- .../fastrtps/types/AnnotationParameterValue.h | 240 +- include/fastrtps/types/DynamicData.h | 220 +- include/fastrtps/types/DynamicDataFactory.h | 22 +- include/fastrtps/types/DynamicDataHelper.hpp | 8 +- include/fastrtps/types/DynamicDataPtr.h | 18 +- include/fastrtps/types/DynamicPubSubType.h | 30 +- include/fastrtps/types/DynamicType.h | 44 +- include/fastrtps/types/DynamicTypeBuilder.h | 63 +- .../types/DynamicTypeBuilderFactory.h | 126 +- .../fastrtps/types/DynamicTypeBuilderPtr.h | 12 +- include/fastrtps/types/DynamicTypeMember.h | 30 +- include/fastrtps/types/DynamicTypePtr.h | 16 +- include/fastrtps/types/MemberDescriptor.h | 136 +- include/fastrtps/types/TypeDescriptor.h | 84 +- include/fastrtps/types/TypeIdentifier.h | 88 +- include/fastrtps/types/TypeIdentifierTypes.h | 350 +- include/fastrtps/types/TypeNamesGenerator.h | 12 +- include/fastrtps/types/TypeObject.h | 2826 +++--- include/fastrtps/types/TypeObjectFactory.h | 57 +- include/fastrtps/types/TypesBase.h | 10 +- include/fastrtps/utils/IPFinder.h | 18 +- include/fastrtps/utils/IPLocator.h | 92 +- include/fastrtps/utils/StringMatching.h | 4 +- include/fastrtps/utils/md5.h | 197 +- src/cpp/dynamic-types/DynamicTypeBuilder.cpp | 2 +- src/cpp/dynamic-types/TypeObjectCdrAux.ipp | 7555 +++++++++-------- .../fastdds/publisher/qos/PublisherQos.cpp | 2 +- src/cpp/fastdds/publisher/qos/WriterQos.cpp | 2 +- .../fastdds/subscriber/qos/SubscriberQos.cpp | 2 +- src/cpp/fastdds/topic/TopicDataType.cpp | 2 +- src/cpp/fastrtps.rc | 8 +- src/cpp/rtps/transport/TCPv4Transport.h | 2 +- src/cpp/rtps/transport/TCPv6Transport.h | 2 +- src/cpp/rtps/transport/UDPv4Transport.h | 2 +- src/cpp/rtps/transport/UDPv6Transport.h | 2 +- .../transport/shared_mem/SharedMemTransport.h | 2 +- .../shared_mem/test_SharedMemTransport.h | 2 +- .../test_SharedMemTransportDescriptor.h | 8 +- src/cpp/rtps/transport/test_UDPv4Transport.h | 12 +- src/cpp/statistics/rtps/StatisticsBase.hpp | 10 +- .../fastdds/dds/core/policy/QosPolicies.hpp | 174 +- .../rtps/participant/RTPSParticipant.h | 4 +- .../attributes/RTPSParticipantAttributes.h | 4 +- .../rtps/builtin/data/ReaderProxyData.h | 8 +- .../shared_mem/SharedMemTransportDescriptor.h | 24 +- .../rtps/transport/TCPTransportDescriptor.h | 4 +- .../rtps/transport/TCPv4TransportDescriptor.h | 4 +- .../rtps/transport/TCPv6TransportDescriptor.h | 4 +- .../rtps/transport/UDPTransportDescriptor.h | 4 +- .../rtps/transport/UDPv4TransportDescriptor.h | 4 +- .../rtps/transport/UDPv6TransportDescriptor.h | 4 +- 175 files changed, 8155 insertions(+), 7805 deletions(-) rename include/{fastrtps/eProsima_auto_link.h => fastdds/fastdds_auto_link.hpp} (100%) rename include/{fastrtps/fastrtps_dll.h => fastdds/fastdds_dll.hpp} (91%) diff --git a/include/fastdds/dds/builtin/common/ReplyHeader.hpp b/include/fastdds/dds/builtin/common/ReplyHeader.hpp index d04b29a6abc..951a7469ea6 100644 --- a/include/fastdds/dds/builtin/common/ReplyHeader.hpp +++ b/include/fastdds/dds/builtin/common/ReplyHeader.hpp @@ -39,7 +39,7 @@ struct ReplyHeader RemoteExceptionCode_t remoteEx; - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } diff --git a/include/fastdds/dds/builtin/common/RequestHeader.hpp b/include/fastdds/dds/builtin/common/RequestHeader.hpp index 6a140ce5e85..09fee20c92e 100644 --- a/include/fastdds/dds/builtin/common/RequestHeader.hpp +++ b/include/fastdds/dds/builtin/common/RequestHeader.hpp @@ -39,7 +39,7 @@ struct RequestHeader InstanceName instanceName; - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } diff --git a/include/fastdds/dds/builtin/typelookup/common/TypeLookupTypes.hpp b/include/fastdds/dds/builtin/typelookup/common/TypeLookupTypes.hpp index 23ebf8ec020..11d1ca42bf1 100644 --- a/include/fastdds/dds/builtin/typelookup/common/TypeLookupTypes.hpp +++ b/include/fastdds/dds/builtin/typelookup/common/TypeLookupTypes.hpp @@ -47,22 +47,22 @@ struct TypeLookup_getTypes_In #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_In::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypes_In& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_In::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_In::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -78,22 +78,22 @@ struct TypeLookup_getTypes_Out #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypes_Out& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -104,58 +104,59 @@ class TypeLookup_getTypes_Result { public: - RTPS_DllAPI TypeLookup_getTypes_Result(); + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result(); - RTPS_DllAPI ~TypeLookup_getTypes_Result(); + FASTDDS_EXPORTED_API ~TypeLookup_getTypes_Result(); - RTPS_DllAPI TypeLookup_getTypes_Result( + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result( const TypeLookup_getTypes_Result& x); - RTPS_DllAPI TypeLookup_getTypes_Result( + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result( TypeLookup_getTypes_Result&& x); - RTPS_DllAPI TypeLookup_getTypes_Result& operator =( + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result& operator =( const TypeLookup_getTypes_Result& x); - RTPS_DllAPI TypeLookup_getTypes_Result& operator =( + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result& operator =( TypeLookup_getTypes_Result&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( int32_t __d); - RTPS_DllAPI int32_t _d() const; + FASTDDS_EXPORTED_API int32_t _d() const; - RTPS_DllAPI int32_t& _d(); + FASTDDS_EXPORTED_API int32_t& _d(); - RTPS_DllAPI void result( + FASTDDS_EXPORTED_API void result( const TypeLookup_getTypes_Out& _result); - RTPS_DllAPI void result( + FASTDDS_EXPORTED_API void result( TypeLookup_getTypes_Out&& _result); - RTPS_DllAPI const TypeLookup_getTypes_Out& result() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypes_Out& result() const; - RTPS_DllAPI TypeLookup_getTypes_Out& result(); + FASTDDS_EXPORTED_API TypeLookup_getTypes_Out& result(); #ifndef DOXYGEN_SHOULD_SKIP_THIS - FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Result::getCdrSerializedSize()", + FASTDDS_SER_METHOD_DEPRECATED(3, + "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Result::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypes_Result& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Result::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Result::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -178,22 +179,23 @@ class TypeLookup_getTypeDependencies_In FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypeDependencies_In& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; - FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In::deserialize()", + FASTDDS_SER_METHOD_DEPRECATED(3, + "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -212,22 +214,23 @@ class TypeLookup_getTypeDependencies_Out FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypeDependencies_Out& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; - FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out::deserialize()", + FASTDDS_SER_METHOD_DEPRECATED(3, + "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -238,59 +241,61 @@ class TypeLookup_getTypeDependencies_Result { public: - RTPS_DllAPI TypeLookup_getTypeDependencies_Result(); + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result(); - RTPS_DllAPI ~TypeLookup_getTypeDependencies_Result(); + FASTDDS_EXPORTED_API ~TypeLookup_getTypeDependencies_Result(); - RTPS_DllAPI TypeLookup_getTypeDependencies_Result( + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result( const TypeLookup_getTypeDependencies_Result& x); - RTPS_DllAPI TypeLookup_getTypeDependencies_Result( + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result( TypeLookup_getTypeDependencies_Result&& x); - RTPS_DllAPI TypeLookup_getTypeDependencies_Result& operator =( + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result& operator =( const TypeLookup_getTypeDependencies_Result& x); - RTPS_DllAPI TypeLookup_getTypeDependencies_Result& operator =( + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result& operator =( TypeLookup_getTypeDependencies_Result&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( int32_t __d); - RTPS_DllAPI int32_t _d() const; + FASTDDS_EXPORTED_API int32_t _d() const; - RTPS_DllAPI int32_t& _d(); + FASTDDS_EXPORTED_API int32_t& _d(); - RTPS_DllAPI void result( + FASTDDS_EXPORTED_API void result( const TypeLookup_getTypeDependencies_Out& _result); - RTPS_DllAPI void result( + FASTDDS_EXPORTED_API void result( TypeLookup_getTypeDependencies_Out&& _result); - RTPS_DllAPI const TypeLookup_getTypeDependencies_Out& result() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypeDependencies_Out& result() const; - RTPS_DllAPI TypeLookup_getTypeDependencies_Out& result(); + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Out& result(); #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Result::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_getTypeDependencies_Result& data, size_t current_alignment = 0); - FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Result::serialize()", + FASTDDS_SER_METHOD_DEPRECATED(3, + "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Result::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; - FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Result::deserialize()", + FASTDDS_SER_METHOD_DEPRECATED(3, + "eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Result::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -305,68 +310,68 @@ class TypeLookup_Call { public: - RTPS_DllAPI TypeLookup_Call(); + FASTDDS_EXPORTED_API TypeLookup_Call(); - RTPS_DllAPI ~TypeLookup_Call(); + FASTDDS_EXPORTED_API ~TypeLookup_Call(); - RTPS_DllAPI TypeLookup_Call( + FASTDDS_EXPORTED_API TypeLookup_Call( const TypeLookup_Call& x); - RTPS_DllAPI TypeLookup_Call( + FASTDDS_EXPORTED_API TypeLookup_Call( TypeLookup_Call&& x); - RTPS_DllAPI TypeLookup_Call& operator =( + FASTDDS_EXPORTED_API TypeLookup_Call& operator =( const TypeLookup_Call& x); - RTPS_DllAPI TypeLookup_Call& operator =( + FASTDDS_EXPORTED_API TypeLookup_Call& operator =( TypeLookup_Call&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( int32_t __d); - RTPS_DllAPI int32_t _d() const; + FASTDDS_EXPORTED_API int32_t _d() const; - RTPS_DllAPI int32_t& _d(); + FASTDDS_EXPORTED_API int32_t& _d(); - RTPS_DllAPI void getTypes( + FASTDDS_EXPORTED_API void getTypes( const TypeLookup_getTypes_In& _getTypes); - RTPS_DllAPI void getTypes( + FASTDDS_EXPORTED_API void getTypes( TypeLookup_getTypes_In&& _getTypes); - RTPS_DllAPI const TypeLookup_getTypes_In& getTypes() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypes_In& getTypes() const; - RTPS_DllAPI TypeLookup_getTypes_In& getTypes(); + FASTDDS_EXPORTED_API TypeLookup_getTypes_In& getTypes(); - RTPS_DllAPI void getTypeDependencies( + FASTDDS_EXPORTED_API void getTypeDependencies( const TypeLookup_getTypeDependencies_In& _getTypeDependencies); - RTPS_DllAPI void getTypeDependencies( + FASTDDS_EXPORTED_API void getTypeDependencies( TypeLookup_getTypeDependencies_In&& _getTypeDependencies); - RTPS_DllAPI const TypeLookup_getTypeDependencies_In& getTypeDependencies() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypeDependencies_In& getTypeDependencies() const; - RTPS_DllAPI TypeLookup_getTypeDependencies_In& getTypeDependencies(); + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_In& getTypeDependencies(); #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Call::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_Call& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Call::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Call::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -390,22 +395,22 @@ class TypeLookup_Request #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Request::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_Request& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Request::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Request::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -416,68 +421,68 @@ class TypeLookup_Return { public: - RTPS_DllAPI TypeLookup_Return(); + FASTDDS_EXPORTED_API TypeLookup_Return(); - RTPS_DllAPI ~TypeLookup_Return(); + FASTDDS_EXPORTED_API ~TypeLookup_Return(); - RTPS_DllAPI TypeLookup_Return( + FASTDDS_EXPORTED_API TypeLookup_Return( const TypeLookup_Return& x); - RTPS_DllAPI TypeLookup_Return( + FASTDDS_EXPORTED_API TypeLookup_Return( TypeLookup_Return&& x); - RTPS_DllAPI TypeLookup_Return& operator =( + FASTDDS_EXPORTED_API TypeLookup_Return& operator =( const TypeLookup_Return& x); - RTPS_DllAPI TypeLookup_Return& operator =( + FASTDDS_EXPORTED_API TypeLookup_Return& operator =( TypeLookup_Return&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( int32_t __d); - RTPS_DllAPI int32_t _d() const; + FASTDDS_EXPORTED_API int32_t _d() const; - RTPS_DllAPI int32_t& _d(); + FASTDDS_EXPORTED_API int32_t& _d(); - RTPS_DllAPI void getType( + FASTDDS_EXPORTED_API void getType( const TypeLookup_getTypes_Result& _getType); - RTPS_DllAPI void getType( + FASTDDS_EXPORTED_API void getType( TypeLookup_getTypes_Result&& _getType); - RTPS_DllAPI const TypeLookup_getTypes_Result& getType() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypes_Result& getType() const; - RTPS_DllAPI TypeLookup_getTypes_Result& getType(); + FASTDDS_EXPORTED_API TypeLookup_getTypes_Result& getType(); - RTPS_DllAPI void getTypeDependencies( + FASTDDS_EXPORTED_API void getTypeDependencies( const TypeLookup_getTypeDependencies_Result& _getTypeDependencies); - RTPS_DllAPI void getTypeDependencies( + FASTDDS_EXPORTED_API void getTypeDependencies( TypeLookup_getTypeDependencies_Result&& _getTypeDependencies); - RTPS_DllAPI const TypeLookup_getTypeDependencies_Result& getTypeDependencies() const; + FASTDDS_EXPORTED_API const TypeLookup_getTypeDependencies_Result& getTypeDependencies() const; - RTPS_DllAPI TypeLookup_getTypeDependencies_Result& getTypeDependencies(); + FASTDDS_EXPORTED_API TypeLookup_getTypeDependencies_Result& getTypeDependencies(); #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Return::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_Return& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Return::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Return::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -501,22 +506,22 @@ class TypeLookup_Reply #ifndef DOXYGEN_SHOULD_SKIP_THIS FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Reply::getCdrSerializedSize()", "In favor of version using eprosima::fastcdr::calculate_serialized_size.") - RTPS_DllAPI static size_t getCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getCdrSerializedSize( const TypeLookup_Reply& data, size_t current_alignment = 0); FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Reply::serialize()", "In favor of version using eprosima::fastcdr::serialize.") - RTPS_DllAPI void serialize( + FASTDDS_EXPORTED_API void serialize( eprosima::fastcdr::Cdr& cdr) const; FASTDDS_SER_METHOD_DEPRECATED(3, "eprosima::fastdds::dds::builtin::TypeLookup_Reply::deserialize()", "In favor of version using eprosima::fastcdr::deserialize.") - RTPS_DllAPI void deserialize( + FASTDDS_EXPORTED_API void deserialize( eprosima::fastcdr::Cdr& cdr); #endif // DOXYGEN_SHOULD_SKIP_THIS - RTPS_DllAPI static bool isKeyDefined() + FASTDDS_EXPORTED_API static bool isKeyDefined() { return false; } @@ -588,25 +593,25 @@ class TypeLookup_RequestTypeSupport : public TypeSupport { public: - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION); } - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload, fastdds::dds::DataRepresentationId_t data_representation) override; - RTPS_DllAPI bool deserialize( + FASTDDS_EXPORTED_API bool deserialize( fastrtps::rtps::SerializedPayload_t* payload, void* data) override; - RTPS_DllAPI void* create_data() override; + FASTDDS_EXPORTED_API void* create_data() override; - RTPS_DllAPI void delete_data( + FASTDDS_EXPORTED_API void delete_data( void* data) override; }; @@ -614,25 +619,25 @@ class TypeLookup_ReplyTypeSupport : public TypeSupport { public: - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION); } - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload, fastdds::dds::DataRepresentationId_t data_representation) override; - RTPS_DllAPI bool deserialize( + FASTDDS_EXPORTED_API bool deserialize( fastrtps::rtps::SerializedPayload_t* payload, void* data) override; - RTPS_DllAPI void* create_data() override; + FASTDDS_EXPORTED_API void* create_data() override; - RTPS_DllAPI void delete_data( + FASTDDS_EXPORTED_API void delete_data( void* data) override; }; diff --git a/include/fastdds/dds/common/InstanceHandle.hpp b/include/fastdds/dds/common/InstanceHandle.hpp index 144af61e0dd..8f55182cb21 100644 --- a/include/fastdds/dds/common/InstanceHandle.hpp +++ b/include/fastdds/dds/common/InstanceHandle.hpp @@ -21,7 +21,7 @@ #define _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_ #include -#include +#include namespace eprosima { @@ -30,7 +30,7 @@ namespace dds { using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; -extern RTPS_DllAPI const InstanceHandle_t HANDLE_NIL; +extern FASTDDS_EXPORTED_API const InstanceHandle_t HANDLE_NIL; } // namespace dds } // namespace fastdds diff --git a/include/fastdds/dds/core/Entity.hpp b/include/fastdds/dds/core/Entity.hpp index e4399624e80..46ed24065db 100644 --- a/include/fastdds/dds/core/Entity.hpp +++ b/include/fastdds/dds/core/Entity.hpp @@ -43,7 +43,7 @@ class Entity * * @param mask StatusMask (default: all) */ - RTPS_DllAPI Entity( + FASTDDS_EXPORTED_API Entity( const StatusMask& mask = StatusMask::all()) : status_mask_(mask) , status_condition_(this) @@ -75,7 +75,7 @@ class Entity * * @return Reference to the StatusMask with the relevant statuses set to 1 */ - RTPS_DllAPI const StatusMask& get_status_mask() const + FASTDDS_EXPORTED_API const StatusMask& get_status_mask() const { return status_mask_; } @@ -94,7 +94,7 @@ class Entity * * @return const reference to the StatusMask with the triggered statuses set to 1 */ - RTPS_DllAPI const StatusMask& get_status_changes() const; + FASTDDS_EXPORTED_API const StatusMask& get_status_changes() const; /** * @brief Retrieves the instance handler that represents the Entity @@ -111,12 +111,12 @@ class Entity * * @return true if enabled, false if not */ - RTPS_DllAPI bool is_enabled() const + FASTDDS_EXPORTED_API bool is_enabled() const { return enable_; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const Entity& other) const { return (this->instance_handle_ == other.instance_handle_); @@ -127,7 +127,7 @@ class Entity * * @return Reference to StatusCondition object */ - RTPS_DllAPI StatusCondition& get_statuscondition() + FASTDDS_EXPORTED_API StatusCondition& get_statuscondition() { return status_condition_; } @@ -139,7 +139,7 @@ class Entity * * @param handle Instance Handle */ - RTPS_DllAPI void set_instance_handle( + FASTDDS_EXPORTED_API void set_instance_handle( const InstanceHandle_t& handle) { instance_handle_ = handle; diff --git a/include/fastdds/dds/core/condition/Condition.hpp b/include/fastdds/dds/core/condition/Condition.hpp index ef364c418b3..3879bef7880 100644 --- a/include/fastdds/dds/core/condition/Condition.hpp +++ b/include/fastdds/dds/core/condition/Condition.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -46,7 +46,7 @@ class Condition * @brief Retrieves the trigger_value of the Condition * @return true if trigger_value is set to 'true', 'false' otherwise */ - RTPS_DllAPI virtual bool get_trigger_value() const + FASTDDS_EXPORTED_API virtual bool get_trigger_value() const { EPROSIMA_LOG_WARNING(CONDITION, "get_trigger_value public member function not implemented"); return false; // TODO return trigger value diff --git a/include/fastdds/dds/core/condition/GuardCondition.hpp b/include/fastdds/dds/core/condition/GuardCondition.hpp index 1912fb8c92f..27f81989091 100644 --- a/include/fastdds/dds/core/condition/GuardCondition.hpp +++ b/include/fastdds/dds/core/condition/GuardCondition.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -45,18 +45,18 @@ class GuardCondition : public Condition { public: - RTPS_DllAPI GuardCondition(); + FASTDDS_EXPORTED_API GuardCondition(); - RTPS_DllAPI ~GuardCondition(); + FASTDDS_EXPORTED_API ~GuardCondition(); - RTPS_DllAPI bool get_trigger_value() const override; + FASTDDS_EXPORTED_API bool get_trigger_value() const override; /** * @brief Set the trigger_value * @param value new value for trigger * @return RETURN_OK */ - RTPS_DllAPI ReturnCode_t set_trigger_value( + FASTDDS_EXPORTED_API ReturnCode_t set_trigger_value( bool value); private: diff --git a/include/fastdds/dds/core/condition/StatusCondition.hpp b/include/fastdds/dds/core/condition/StatusCondition.hpp index 49fd0adc920..3335de5ad32 100644 --- a/include/fastdds/dds/core/condition/StatusCondition.hpp +++ b/include/fastdds/dds/core/condition/StatusCondition.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -68,27 +68,27 @@ class StatusCondition final : public Condition * @brief Retrieves the trigger_value of the Condition * @return true if trigger_value is set to 'true', 'false' otherwise */ - RTPS_DllAPI bool get_trigger_value() const override; + FASTDDS_EXPORTED_API bool get_trigger_value() const override; /** * @brief Defines the list of communication statuses that are taken into account to determine the trigger_value * @param mask defines the mask for the status * @return RETCODE_OK with everything ok, error code otherwise */ - RTPS_DllAPI ReturnCode_t set_enabled_statuses( + FASTDDS_EXPORTED_API ReturnCode_t set_enabled_statuses( const StatusMask& mask); /** * @brief Retrieves the list of communication statuses that are taken into account to determine the trigger_value * @return Status set or default status if it has not been set */ - RTPS_DllAPI const StatusMask& get_enabled_statuses() const; + FASTDDS_EXPORTED_API const StatusMask& get_enabled_statuses() const; /** * @brief Returns the Entity associated * @return Entity */ - RTPS_DllAPI Entity* get_entity() const; + FASTDDS_EXPORTED_API Entity* get_entity() const; detail::StatusConditionImpl* get_impl() const { diff --git a/include/fastdds/dds/core/condition/WaitSet.hpp b/include/fastdds/dds/core/condition/WaitSet.hpp index 2066aaede7f..6b805d0bf04 100644 --- a/include/fastdds/dds/core/condition/WaitSet.hpp +++ b/include/fastdds/dds/core/condition/WaitSet.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -47,9 +47,9 @@ class WaitSet { public: - RTPS_DllAPI WaitSet(); + FASTDDS_EXPORTED_API WaitSet(); - RTPS_DllAPI ~WaitSet(); + FASTDDS_EXPORTED_API ~WaitSet(); WaitSet( const WaitSet&) = delete; @@ -65,7 +65,7 @@ class WaitSet * @param cond Condition * @return RETCODE_OK if attached correctly, error code otherwise */ - RTPS_DllAPI ReturnCode_t attach_condition( + FASTDDS_EXPORTED_API ReturnCode_t attach_condition( const Condition& cond); @@ -74,7 +74,7 @@ class WaitSet * @param cond Condition * @return RETCODE_OK if detached correctly, PRECONDITION_NOT_MET if condition was not attached */ - RTPS_DllAPI ReturnCode_t detach_condition( + FASTDDS_EXPORTED_API ReturnCode_t detach_condition( const Condition& cond); /** @@ -86,7 +86,7 @@ class WaitSet * @return RETCODE_OK if everything correct, PRECONDITION_NOT_MET if WaitSet already waiting, TIMEOUT if maximum * time expired, error code otherwise */ - RTPS_DllAPI ReturnCode_t wait( + FASTDDS_EXPORTED_API ReturnCode_t wait( ConditionSeq& active_conditions, const fastrtps::Duration_t timeout) const; @@ -95,7 +95,7 @@ class WaitSet * @param attached_conditions Reference to the collection of attached conditions * @return RETCODE_OK if everything correct, error code otherwise */ - RTPS_DllAPI ReturnCode_t get_conditions( + FASTDDS_EXPORTED_API ReturnCode_t get_conditions( ConditionSeq& attached_conditions) const; private: diff --git a/include/fastdds/dds/core/policy/ParameterTypes.hpp b/include/fastdds/dds/core/policy/ParameterTypes.hpp index 873eada6edf..3fc0a760456 100644 --- a/include/fastdds/dds/core/policy/ParameterTypes.hpp +++ b/include/fastdds/dds/core/policy/ParameterTypes.hpp @@ -174,7 +174,7 @@ class Parameter_t /** * @brief Constructor without parameters */ - RTPS_DllAPI Parameter_t() + FASTDDS_EXPORTED_API Parameter_t() : Pid(PID_PAD) , length(0) { @@ -186,7 +186,7 @@ class Parameter_t * @param pid Pid of the parameter * @param length Its associated length */ - RTPS_DllAPI Parameter_t( + FASTDDS_EXPORTED_API Parameter_t( ParameterId_t pid, uint16_t length) : Pid(pid) @@ -197,7 +197,7 @@ class Parameter_t /** * @brief Destructor */ - virtual RTPS_DllAPI ~Parameter_t() + virtual FASTDDS_EXPORTED_API ~Parameter_t() { } diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp index 5ac318e57db..e6469a1e25b 100644 --- a/include/fastdds/dds/core/policy/QosPolicies.hpp +++ b/include/fastdds/dds/core/policy/QosPolicies.hpp @@ -195,7 +195,7 @@ class EntityFactoryQosPolicy /** * @brief Constructor without parameters */ - RTPS_DllAPI EntityFactoryQosPolicy() + FASTDDS_EXPORTED_API EntityFactoryQosPolicy() : autoenable_created_entities(true) { } @@ -205,7 +205,7 @@ class EntityFactoryQosPolicy * * @param autoenable Value for the autoenable_created_entities boolean */ - RTPS_DllAPI EntityFactoryQosPolicy( + FASTDDS_EXPORTED_API EntityFactoryQosPolicy( bool autoenable) : autoenable_created_entities(autoenable) { @@ -214,7 +214,7 @@ class EntityFactoryQosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~EntityFactoryQosPolicy() + virtual FASTDDS_EXPORTED_API ~EntityFactoryQosPolicy() { } @@ -277,7 +277,7 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DurabilityQosPolicy() + FASTDDS_EXPORTED_API DurabilityQosPolicy() : Parameter_t(PID_DURABILITY, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(VOLATILE_DURABILITY_QOS) @@ -287,7 +287,7 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DurabilityQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DurabilityQosPolicy() = default; /** * Translates kind to rtps layer equivalent @@ -362,7 +362,7 @@ class DeadlineQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DeadlineQosPolicy() + FASTDDS_EXPORTED_API DeadlineQosPolicy() : Parameter_t(PID_DEADLINE, PARAMETER_TIME_LENGTH) , QosPolicy(true) , period(TIME_T_INFINITE_SECONDS, TIME_T_INFINITE_NANOSECONDS) @@ -372,7 +372,7 @@ class DeadlineQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DeadlineQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DeadlineQosPolicy() = default; bool operator ==( const DeadlineQosPolicy& b) const @@ -415,7 +415,7 @@ class LatencyBudgetQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI LatencyBudgetQosPolicy() + FASTDDS_EXPORTED_API LatencyBudgetQosPolicy() : Parameter_t(PID_LATENCY_BUDGET, PARAMETER_TIME_LENGTH) , QosPolicy(true) , duration(0, 0) @@ -425,7 +425,7 @@ class LatencyBudgetQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~LatencyBudgetQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~LatencyBudgetQosPolicy() = default; bool operator ==( const LatencyBudgetQosPolicy& b) const @@ -487,7 +487,7 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI LivelinessQosPolicy() + FASTDDS_EXPORTED_API LivelinessQosPolicy() : Parameter_t(PID_LIVELINESS, PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) , QosPolicy(true) , kind(AUTOMATIC_LIVELINESS_QOS) @@ -499,7 +499,7 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~LivelinessQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~LivelinessQosPolicy() = default; bool operator ==( const LivelinessQosPolicy& b) const @@ -569,7 +569,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI ReliabilityQosPolicy() + FASTDDS_EXPORTED_API ReliabilityQosPolicy() : Parameter_t(PID_RELIABILITY, PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) , QosPolicy(true) //indicate send always , kind(BEST_EFFORT_RELIABILITY_QOS) @@ -580,7 +580,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~ReliabilityQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~ReliabilityQosPolicy() = default; bool operator ==( const ReliabilityQosPolicy& b) const @@ -651,7 +651,7 @@ class OwnershipQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI OwnershipQosPolicy() + FASTDDS_EXPORTED_API OwnershipQosPolicy() : Parameter_t(PID_OWNERSHIP, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(SHARED_OWNERSHIP_QOS) @@ -661,7 +661,7 @@ class OwnershipQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~OwnershipQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~OwnershipQosPolicy() = default; bool operator ==( const OwnershipQosPolicy& b) const @@ -718,7 +718,7 @@ class DestinationOrderQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DestinationOrderQosPolicy() + FASTDDS_EXPORTED_API DestinationOrderQosPolicy() : Parameter_t(PID_DESTINATION_ORDER, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS) @@ -728,7 +728,7 @@ class DestinationOrderQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DestinationOrderQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DestinationOrderQosPolicy() = default; bool operator ==( const DestinationOrderQosPolicy& b) const @@ -761,7 +761,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, public: - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid) : Parameter_t(pid, 0) , QosPolicy(false) @@ -769,7 +769,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { } - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid, uint16_t in_length) : Parameter_t(pid, in_length) @@ -786,7 +786,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @param data data to copy in the newly created object */ - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( const GenericDataQosPolicy& data) : Parameter_t(data.Pid, data.length) , QosPolicy(false) @@ -803,7 +803,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * @param pid Id of the parameter * @param data data to copy in the newly created object */ - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid, const collection_type& data) : Parameter_t(pid, 0) @@ -814,7 +814,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, length = static_cast((size() + 7u) & ~3u); } - virtual RTPS_DllAPI ~GenericDataQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~GenericDataQosPolicy() = default; /** * Copies data from underlying collection type. @@ -919,7 +919,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @return raw data as vector of octets. * */ - RTPS_DllAPI inline const collection_type& data_vec() const + FASTDDS_EXPORTED_API inline const collection_type& data_vec() const { return collection_; } @@ -929,7 +929,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @return raw data as vector of octets. * */ - RTPS_DllAPI inline collection_type& data_vec() + FASTDDS_EXPORTED_API inline collection_type& data_vec() { return collection_; } @@ -939,7 +939,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @param vec raw data to set. * */ - RTPS_DllAPI inline void data_vec( + FASTDDS_EXPORTED_API inline void data_vec( const collection_type& vec) { if (collection_ != vec) @@ -955,7 +955,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @return raw data as vector of octets. * */ - RTPS_DllAPI inline const collection_type& getValue() const + FASTDDS_EXPORTED_API inline const collection_type& getValue() const { return collection_; } @@ -965,7 +965,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @param vec raw data to set. * */ - RTPS_DllAPI inline void setValue( + FASTDDS_EXPORTED_API inline void setValue( const collection_type& vec) { data_vec(vec); @@ -986,12 +986,12 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { \ public: \ \ - RTPS_DllAPI TClassName() \ + FASTDDS_EXPORTED_API TClassName() \ : GenericDataQosPolicy(TPid) \ { \ } \ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ uint16_t in_length) \ : GenericDataQosPolicy(TPid, in_length) \ { \ @@ -1005,7 +1005,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * \ * @param data data to copy in the newly created object \ */ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ const TClassName &data) = default; \ \ /** \ @@ -1016,13 +1016,13 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * \ * @param data data to copy in the newly created object \ */ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ const collection_type &data) \ : GenericDataQosPolicy(TPid, data) \ { \ } \ \ - virtual RTPS_DllAPI ~TClassName() = default; \ + virtual FASTDDS_EXPORTED_API ~TClassName() = default; \ \ /** \ * Copies another TClassName. \ @@ -1103,7 +1103,7 @@ class TimeBasedFilterQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TimeBasedFilterQosPolicy() + FASTDDS_EXPORTED_API TimeBasedFilterQosPolicy() : Parameter_t(PID_TIME_BASED_FILTER, PARAMETER_TIME_LENGTH) , QosPolicy(false) , minimum_separation(0, 0) @@ -1113,7 +1113,7 @@ class TimeBasedFilterQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TimeBasedFilterQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~TimeBasedFilterQosPolicy() = default; bool operator ==( const TimeBasedFilterQosPolicy& b) const @@ -1177,7 +1177,7 @@ class PresentationQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor without parameters */ - RTPS_DllAPI PresentationQosPolicy() + FASTDDS_EXPORTED_API PresentationQosPolicy() : Parameter_t(PID_PRESENTATION, PARAMETER_PRESENTATION_LENGTH) , QosPolicy(false) , access_scope(INSTANCE_PRESENTATION_QOS) @@ -1189,7 +1189,7 @@ class PresentationQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~PresentationQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~PresentationQosPolicy() = default; bool operator ==( const PresentationQosPolicy& b) const @@ -1390,7 +1390,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor without parameters */ - RTPS_DllAPI PartitionQosPolicy() + FASTDDS_EXPORTED_API PartitionQosPolicy() : Parameter_t(PID_PARTITION, 0) , QosPolicy(false) , max_size_ (0) @@ -1403,7 +1403,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @param in_length Length of the parameter */ - RTPS_DllAPI PartitionQosPolicy( + FASTDDS_EXPORTED_API PartitionQosPolicy( uint16_t in_length) : Parameter_t(PID_PARTITION, in_length) , QosPolicy(false) @@ -1418,7 +1418,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @param b Another PartitionQosPolicy instance */ - RTPS_DllAPI PartitionQosPolicy( + FASTDDS_EXPORTED_API PartitionQosPolicy( const PartitionQosPolicy& b) : Parameter_t(b) , QosPolicy(b) @@ -1434,7 +1434,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~PartitionQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~PartitionQosPolicy() = default; bool operator ==( const PartitionQosPolicy& b) const @@ -1528,7 +1528,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @param name Name to append. */ - RTPS_DllAPI inline void push_back( + FASTDDS_EXPORTED_API inline void push_back( const char* name) { //Realloc if needed; @@ -1560,7 +1560,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * Clears list of partition names */ - RTPS_DllAPI inline void clear() override + FASTDDS_EXPORTED_API inline void clear() override { partitions_.length = 0; Npartitions_ = 0; @@ -1572,7 +1572,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @return Vector of partition name strings. */ - RTPS_DllAPI inline const std::vector getNames() const + FASTDDS_EXPORTED_API inline const std::vector getNames() const { return names(); } @@ -1582,7 +1582,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @param nam Vector of partition name strings. */ - RTPS_DllAPI inline void setNames( + FASTDDS_EXPORTED_API inline void setNames( std::vector& nam) { names(nam); @@ -1593,7 +1593,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @return Vector of partition name strings. */ - RTPS_DllAPI inline const std::vector names() const + FASTDDS_EXPORTED_API inline const std::vector names() const { std::vector names; if (Npartitions_ > 0) @@ -1611,7 +1611,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * * @param nam Vector of partition name strings. */ - RTPS_DllAPI inline void names( + FASTDDS_EXPORTED_API inline void names( std::vector& nam) { clear(); @@ -1672,7 +1672,7 @@ class HistoryQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI HistoryQosPolicy() + FASTDDS_EXPORTED_API HistoryQosPolicy() : Parameter_t(PID_HISTORY, PARAMETER_KIND_LENGTH + 4) , QosPolicy(true) , kind(KEEP_LAST_HISTORY_QOS) @@ -1683,7 +1683,7 @@ class HistoryQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~HistoryQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~HistoryQosPolicy() = default; bool operator ==( const HistoryQosPolicy& b) const @@ -1761,7 +1761,7 @@ class ResourceLimitsQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI ResourceLimitsQosPolicy() + FASTDDS_EXPORTED_API ResourceLimitsQosPolicy() : Parameter_t(PID_RESOURCE_LIMITS, 4 + 4 + 4) , QosPolicy(false) , max_samples(5000) @@ -1775,7 +1775,7 @@ class ResourceLimitsQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~ResourceLimitsQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~ResourceLimitsQosPolicy() = default; bool operator ==( const ResourceLimitsQosPolicy& b) const @@ -1813,7 +1813,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DurabilityServiceQosPolicy() + FASTDDS_EXPORTED_API DurabilityServiceQosPolicy() : Parameter_t(PID_DURABILITY_SERVICE, PARAMETER_TIME_LENGTH + PARAMETER_KIND_LENGTH + 4 + 4 + 4 + 4) , QosPolicy(false) , history_kind(KEEP_LAST_HISTORY_QOS) @@ -1827,7 +1827,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DurabilityServiceQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DurabilityServiceQosPolicy() = default; bool operator ==( const DurabilityServiceQosPolicy& b) const @@ -1901,7 +1901,7 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI LifespanQosPolicy() + FASTDDS_EXPORTED_API LifespanQosPolicy() : Parameter_t(PID_LIFESPAN, PARAMETER_TIME_LENGTH) , QosPolicy(true) , duration(TIME_T_INFINITE_SECONDS, TIME_T_INFINITE_NANOSECONDS) @@ -1911,7 +1911,7 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~LifespanQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~LifespanQosPolicy() = default; bool operator ==( const LifespanQosPolicy& b) const @@ -1947,7 +1947,7 @@ class OwnershipStrengthQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI OwnershipStrengthQosPolicy() + FASTDDS_EXPORTED_API OwnershipStrengthQosPolicy() : Parameter_t(PID_OWNERSHIP_STRENGTH, 4) , QosPolicy(false) , value(0) @@ -1957,7 +1957,7 @@ class OwnershipStrengthQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~OwnershipStrengthQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~OwnershipStrengthQosPolicy() = default; bool operator ==( const OwnershipStrengthQosPolicy& b) const @@ -1997,7 +1997,7 @@ class TransportPriorityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TransportPriorityQosPolicy() + FASTDDS_EXPORTED_API TransportPriorityQosPolicy() : Parameter_t(PID_TRANSPORT_PRIORITY, 4) , QosPolicy(false) , value(0) @@ -2007,7 +2007,7 @@ class TransportPriorityQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TransportPriorityQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~TransportPriorityQosPolicy() = default; bool operator ==( const TransportPriorityQosPolicy& b) const @@ -2099,7 +2099,7 @@ class DataRepresentationQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DataRepresentationQosPolicy() + FASTDDS_EXPORTED_API DataRepresentationQosPolicy() : Parameter_t(PID_DATA_REPRESENTATION, 0) , QosPolicy(false) { @@ -2108,7 +2108,7 @@ class DataRepresentationQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DataRepresentationQosPolicy() override = default; + virtual FASTDDS_EXPORTED_API ~DataRepresentationQosPolicy() override = default; /** * Compares the given policy to check if it's equal. @@ -2198,7 +2198,7 @@ class TypeConsistencyEnforcementQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TypeConsistencyEnforcementQosPolicy() + FASTDDS_EXPORTED_API TypeConsistencyEnforcementQosPolicy() : Parameter_t(PID_TYPE_CONSISTENCY_ENFORCEMENT, 8) // 2 + 5 + 1 alignment byte , QosPolicy(true) { @@ -2213,7 +2213,7 @@ class TypeConsistencyEnforcementQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TypeConsistencyEnforcementQosPolicy() override = default; + virtual FASTDDS_EXPORTED_API ~TypeConsistencyEnforcementQosPolicy() override = default; bool operator ==( const TypeConsistencyEnforcementQosPolicy& b) const @@ -2248,7 +2248,7 @@ class DisablePositiveACKsQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DisablePositiveACKsQosPolicy() + FASTDDS_EXPORTED_API DisablePositiveACKsQosPolicy() : Parameter_t(PID_DISABLE_POSITIVE_ACKS, PARAMETER_BOOL_LENGTH) , QosPolicy(true) , enabled(false) @@ -2259,7 +2259,7 @@ class DisablePositiveACKsQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DisablePositiveACKsQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DisablePositiveACKsQosPolicy() = default; bool operator ==( const DisablePositiveACKsQosPolicy& b) const @@ -2298,7 +2298,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy /** * @brief Constructor without parameters */ - RTPS_DllAPI TypeIdV1() + FASTDDS_EXPORTED_API TypeIdV1() : Parameter_t(PID_TYPE_IDV1, 0) , QosPolicy(false) , m_type_identifier() @@ -2310,7 +2310,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy * * @param type Another instance of TypeIdV1 */ - RTPS_DllAPI TypeIdV1( + FASTDDS_EXPORTED_API TypeIdV1( const TypeIdV1& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2323,7 +2323,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy * * @param identifier TypeIdentifier to be set */ - RTPS_DllAPI TypeIdV1( + FASTDDS_EXPORTED_API TypeIdV1( const fastrtps::types::TypeIdentifier& identifier) : Parameter_t(PID_TYPE_IDV1, 0) , QosPolicy(false) @@ -2336,7 +2336,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy * * @param type Another instance of TypeIdV1 */ - RTPS_DllAPI TypeIdV1( + FASTDDS_EXPORTED_API TypeIdV1( TypeIdV1&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2344,7 +2344,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy { } - RTPS_DllAPI TypeIdV1& operator =( + FASTDDS_EXPORTED_API TypeIdV1& operator =( const TypeIdV1& type) { Pid = type.Pid; @@ -2356,7 +2356,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy return *this; } - RTPS_DllAPI TypeIdV1& operator =( + FASTDDS_EXPORTED_API TypeIdV1& operator =( TypeIdV1&& type) { Pid = type.Pid; @@ -2371,14 +2371,14 @@ class TypeIdV1 : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TypeIdV1() override = default; + virtual FASTDDS_EXPORTED_API ~TypeIdV1() override = default; inline void clear() override { *this = TypeIdV1(); } - RTPS_DllAPI TypeIdV1& operator =( + FASTDDS_EXPORTED_API TypeIdV1& operator =( const fastrtps::types::TypeIdentifier& type_id) { m_type_identifier = type_id; @@ -2390,7 +2390,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy * * @return TypeIdentifier reference */ - RTPS_DllAPI const fastrtps::types::TypeIdentifier& get() const + FASTDDS_EXPORTED_API const fastrtps::types::TypeIdentifier& get() const { return m_type_identifier; } @@ -2410,7 +2410,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TypeObjectV1() + FASTDDS_EXPORTED_API TypeObjectV1() : Parameter_t(PID_TYPE_OBJECTV1, 0) , QosPolicy(false) , m_type_object() @@ -2422,7 +2422,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy * * @param type Another instance of TypeObjectV1 */ - RTPS_DllAPI TypeObjectV1( + FASTDDS_EXPORTED_API TypeObjectV1( const TypeObjectV1& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2435,7 +2435,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy * * @param type TypeObject to be set */ - RTPS_DllAPI TypeObjectV1( + FASTDDS_EXPORTED_API TypeObjectV1( const fastrtps::types::TypeObject& type) : Parameter_t(PID_TYPE_OBJECTV1, 0) , QosPolicy(false) @@ -2448,7 +2448,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy * * @param type Another instance of TypeObjectV1 */ - RTPS_DllAPI TypeObjectV1( + FASTDDS_EXPORTED_API TypeObjectV1( TypeObjectV1&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2456,7 +2456,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy { } - RTPS_DllAPI TypeObjectV1& operator =( + FASTDDS_EXPORTED_API TypeObjectV1& operator =( const TypeObjectV1& type) { Pid = type.Pid; @@ -2468,7 +2468,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy return *this; } - RTPS_DllAPI TypeObjectV1& operator =( + FASTDDS_EXPORTED_API TypeObjectV1& operator =( TypeObjectV1&& type) { Pid = type.Pid; @@ -2483,14 +2483,14 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TypeObjectV1() override = default; + virtual FASTDDS_EXPORTED_API ~TypeObjectV1() override = default; inline void clear() override { *this = TypeObjectV1(); } - RTPS_DllAPI TypeObjectV1& operator =( + FASTDDS_EXPORTED_API TypeObjectV1& operator =( const fastrtps::types::TypeObject& type_object) { m_type_object = type_object; @@ -2502,7 +2502,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy * * @return TypeObject reference */ - RTPS_DllAPI const fastrtps::types::TypeObject& get() const + FASTDDS_EXPORTED_API const fastrtps::types::TypeObject& get() const { return m_type_object; } @@ -2524,7 +2524,7 @@ class TypeInformation : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TypeInformation() + FASTDDS_EXPORTED_API TypeInformation() : Parameter_t(PID_TYPE_INFORMATION, 0) , QosPolicy(false) , type_information() @@ -2537,7 +2537,7 @@ class TypeInformation : public Parameter_t, public QosPolicy * * @param type Another instance of TypeInformation */ - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( const TypeInformation& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2551,7 +2551,7 @@ class TypeInformation : public Parameter_t, public QosPolicy * * @param info fastrtps::types::TypeInformation to be set */ - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( const fastrtps::types::TypeInformation& info) : Parameter_t(PID_TYPE_INFORMATION, 0) , QosPolicy(false) @@ -2565,7 +2565,7 @@ class TypeInformation : public Parameter_t, public QosPolicy * * @param type Another instance of TypeInformation */ - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( TypeInformation&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.send_always_) @@ -2574,7 +2574,7 @@ class TypeInformation : public Parameter_t, public QosPolicy { } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( const TypeInformation& type) { Pid = type.Pid; @@ -2587,7 +2587,7 @@ class TypeInformation : public Parameter_t, public QosPolicy return *this; } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( TypeInformation&& type) { Pid = type.Pid; @@ -2603,7 +2603,7 @@ class TypeInformation : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TypeInformation() override = default; + virtual FASTDDS_EXPORTED_API ~TypeInformation() override = default; inline void clear() override { @@ -2615,7 +2615,7 @@ class TypeInformation : public Parameter_t, public QosPolicy * * @return true if assigned, false if not */ - RTPS_DllAPI bool assigned() const + FASTDDS_EXPORTED_API bool assigned() const { return assigned_; } @@ -2625,13 +2625,13 @@ class TypeInformation : public Parameter_t, public QosPolicy * * @param value Boolean to be set */ - RTPS_DllAPI void assigned( + FASTDDS_EXPORTED_API void assigned( bool value) { assigned_ = value; } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( const fastrtps::types::TypeInformation& type_info) { type_information = type_info; @@ -2662,7 +2662,7 @@ class WireProtocolConfigQos : public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI WireProtocolConfigQos() + FASTDDS_EXPORTED_API WireProtocolConfigQos() : QosPolicy(false) , participant_id(-1) { @@ -2671,7 +2671,7 @@ class WireProtocolConfigQos : public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~WireProtocolConfigQos() = default; + virtual FASTDDS_EXPORTED_API ~WireProtocolConfigQos() = default; bool operator ==( const WireProtocolConfigQos& b) const @@ -2744,7 +2744,7 @@ class TransportConfigQos : public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TransportConfigQos() + FASTDDS_EXPORTED_API TransportConfigQos() : QosPolicy(false) , use_builtin_transports(true) , send_socket_buffer_size(0) @@ -2757,7 +2757,7 @@ class TransportConfigQos : public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TransportConfigQos() = default; + virtual FASTDDS_EXPORTED_API ~TransportConfigQos() = default; bool operator ==( const TransportConfigQos& b) const @@ -2813,9 +2813,9 @@ class RTPSEndpointQos { public: - RTPS_DllAPI RTPSEndpointQos() = default; + FASTDDS_EXPORTED_API RTPSEndpointQos() = default; - virtual RTPS_DllAPI ~RTPSEndpointQos() = default; + virtual FASTDDS_EXPORTED_API ~RTPSEndpointQos() = default; bool operator ==( const RTPSEndpointQos& b) const @@ -2864,7 +2864,7 @@ class WriterResourceLimitsQos /** * @brief Constructor */ - RTPS_DllAPI WriterResourceLimitsQos() + FASTDDS_EXPORTED_API WriterResourceLimitsQos() : matched_subscriber_allocation() , reader_filters_allocation(0, 32u, 1u) { @@ -2873,7 +2873,7 @@ class WriterResourceLimitsQos /** * @brief Destructor */ - virtual RTPS_DllAPI ~WriterResourceLimitsQos() = default; + virtual FASTDDS_EXPORTED_API ~WriterResourceLimitsQos() = default; bool operator ==( const WriterResourceLimitsQos& b) const @@ -2922,7 +2922,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI DataSharingQosPolicy() + FASTDDS_EXPORTED_API DataSharingQosPolicy() : Parameter_t(PID_DATASHARING, 0) , QosPolicy(true) { @@ -2933,14 +2933,14 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~DataSharingQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DataSharingQosPolicy() = default; /** * @brief Copy constructor * * @param b Another DataSharingQosPolicy instance */ - RTPS_DllAPI DataSharingQosPolicy( + FASTDDS_EXPORTED_API DataSharingQosPolicy( const DataSharingQosPolicy& b) : Parameter_t(b) , QosPolicy(b) @@ -2954,7 +2954,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy domain_ids_ = b.domain_ids(); } - RTPS_DllAPI DataSharingQosPolicy& operator =( + FASTDDS_EXPORTED_API DataSharingQosPolicy& operator =( const DataSharingQosPolicy& b) { QosPolicy::operator =(b); @@ -2991,7 +2991,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @return the current DataSharing configuration mode */ - RTPS_DllAPI const DataSharingKind& kind() const + FASTDDS_EXPORTED_API const DataSharingKind& kind() const { return kind_; } @@ -2999,7 +2999,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @return the current DataSharing shared memory directory */ - RTPS_DllAPI const std::string& shm_directory() const + FASTDDS_EXPORTED_API const std::string& shm_directory() const { return shm_directory_; } @@ -3017,7 +3017,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * * @return the current DataSharing domain IDs */ - RTPS_DllAPI const std::vector& domain_ids() const + FASTDDS_EXPORTED_API const std::vector& domain_ids() const { return domain_ids_; } @@ -3025,7 +3025,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @param size the new maximum number of domain IDs */ - RTPS_DllAPI void set_max_domains( + FASTDDS_EXPORTED_API void set_max_domains( uint32_t size) { domain_ids_.reserve(size); @@ -3035,7 +3035,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @return the current configured maximum number of domain IDs */ - RTPS_DllAPI const uint32_t& max_domains() const + FASTDDS_EXPORTED_API const uint32_t& max_domains() const { return max_domains_; } @@ -3046,7 +3046,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * The default shared memory directory of the OS is used. * A default domain ID is automatically computed. */ - RTPS_DllAPI void automatic() + FASTDDS_EXPORTED_API void automatic() { setup (AUTO, "", std::vector()); } @@ -3058,7 +3058,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * * @param domain_ids the user configured DataSharing domain IDs (16 bits). */ - RTPS_DllAPI void automatic( + FASTDDS_EXPORTED_API void automatic( const std::vector& domain_ids) { setup (AUTO, "", domain_ids); @@ -3071,7 +3071,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * * @param directory The shared memory directory to use. */ - RTPS_DllAPI void automatic( + FASTDDS_EXPORTED_API void automatic( const std::string& directory) { setup (AUTO, directory, std::vector()); @@ -3083,7 +3083,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * @param directory The shared memory directory to use. * @param domain_ids the user configured DataSharing domain IDs (16 bits). */ - RTPS_DllAPI void automatic( + FASTDDS_EXPORTED_API void automatic( const std::string& directory, const std::vector& domain_ids) { @@ -3098,7 +3098,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * @param directory The shared memory directory to use. * It is mandatory to provide a non-empty name or the creation of endpoints will fail. */ - RTPS_DllAPI void on( + FASTDDS_EXPORTED_API void on( const std::string& directory) { // TODO [ILG]: This parameter is unused right now. Activate the assert once it is used @@ -3113,7 +3113,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * It is mandatory to provide a non-empty name or the creation of endpoints will fail. * @param domain_ids the user configured DataSharing domain IDs (16 bits). */ - RTPS_DllAPI void on( + FASTDDS_EXPORTED_API void on( const std::string& directory, const std::vector& domain_ids) { @@ -3125,7 +3125,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @brief Configures the DataSharing in disabled mode */ - RTPS_DllAPI void off() + FASTDDS_EXPORTED_API void off() { setup (OFF, "", std::vector()); } @@ -3135,7 +3135,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy * * @param id 16 bit identifier */ - RTPS_DllAPI void add_domain_id( + FASTDDS_EXPORTED_API void add_domain_id( uint16_t id) { if (max_domains_ == 0 || domain_ids_.size() < max_domains_) diff --git a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp index 9e848d80068..2a3dd9f2a98 100644 --- a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp +++ b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp @@ -48,7 +48,7 @@ class ReaderDataLifecycleQosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~ReaderDataLifecycleQosPolicy() + virtual FASTDDS_EXPORTED_API ~ReaderDataLifecycleQosPolicy() { } diff --git a/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp b/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp index d4d075bfab1..6f412f513c1 100644 --- a/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp +++ b/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp @@ -41,7 +41,7 @@ class WriterDataLifecycleQosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~WriterDataLifecycleQosPolicy() + virtual FASTDDS_EXPORTED_API ~WriterDataLifecycleQosPolicy() { } diff --git a/include/fastdds/dds/core/status/StatusMask.hpp b/include/fastdds/dds/core/status/StatusMask.hpp index 2718869d75c..6e21b87ca9f 100644 --- a/include/fastdds/dds/core/status/StatusMask.hpp +++ b/include/fastdds/dds/core/status/StatusMask.hpp @@ -21,7 +21,7 @@ #ifndef _FASTDDS_STATUSMASK_HPP_ #define _FASTDDS_STATUSMASK_HPP_ -#include +#include #include #include @@ -44,7 +44,7 @@ namespace dds { * - indicate status changes when calling dds::core::Entity::status_changes */ -class RTPS_DllAPI StatusMask : public std::bitset +class FASTDDS_EXPORTED_API StatusMask : public std::bitset { public: diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp index 572b850e5ce..5cca4358a0b 100644 --- a/include/fastdds/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/dds/domain/DomainParticipant.hpp @@ -104,7 +104,7 @@ class DomainParticipant : public Entity * @param qos DomainParticipantQos reference where the qos is going to be returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( DomainParticipantQos& qos) const; /** @@ -112,7 +112,7 @@ class DomainParticipant : public Entity * * @return A reference to the DomainParticipantQos */ - RTPS_DllAPI const DomainParticipantQos& get_qos() const; + FASTDDS_EXPORTED_API const DomainParticipantQos& get_qos() const; /** * This operation sets the value of the DomainParticipant QoS policies. @@ -121,7 +121,7 @@ class DomainParticipant : public Entity * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is not * self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const DomainParticipantQos& qos) const; /** @@ -129,7 +129,7 @@ class DomainParticipant : public Entity * * @return DomainParticipantListener pointer */ - RTPS_DllAPI const DomainParticipantListener* get_listener() const; + FASTDDS_EXPORTED_API const DomainParticipantListener* get_listener() const; /** * Modifies the DomainParticipantListener, sets the mask to StatusMask::all() @@ -138,7 +138,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if successful, RETCODE_ERROR otherwise. * @warning Do not call this method from a \c DomainParticipantListener callback. */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DomainParticipantListener* listener); /** @@ -149,7 +149,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if successful, RETCODE_ERROR if failed (timeout expired). * @warning Do not call this method from a \c DomainParticipantListener callback. */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DomainParticipantListener* listener, const std::chrono::seconds timeout); @@ -161,7 +161,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if successful, RETCODE_ERROR otherwise. * @warning Do not call this method from a \c DomainParticipantListener callback. */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DomainParticipantListener* listener, const StatusMask& mask); @@ -174,7 +174,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if successful, RETCODE_ERROR if failed (timeout expired) * @warning Do not call this method from a \c DomainParticipantListener callback. */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DomainParticipantListener* listener, const StatusMask& mask, const std::chrono::seconds timeout); @@ -184,7 +184,7 @@ class DomainParticipant : public Entity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t enable() override; + FASTDDS_EXPORTED_API ReturnCode_t enable() override; // DomainParticipant specific methods from DDS API @@ -196,7 +196,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Publisher. */ - RTPS_DllAPI Publisher* create_publisher( + FASTDDS_EXPORTED_API Publisher* create_publisher( const PublisherQos& qos, PublisherListener* listener = nullptr, const StatusMask& mask = StatusMask::all()); @@ -209,7 +209,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Publisher. */ - RTPS_DllAPI Publisher* create_publisher_with_profile( + FASTDDS_EXPORTED_API Publisher* create_publisher_with_profile( const std::string& profile_name, PublisherListener* listener = nullptr, const StatusMask& mask = StatusMask::all()); @@ -221,7 +221,7 @@ class DomainParticipant : public Entity * @return RETCODE_PRECONDITION_NOT_MET if the publisher does not belong to this participant or if it has active DataWriters, * RETCODE_OK if it is correctly deleted and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t delete_publisher( + FASTDDS_EXPORTED_API ReturnCode_t delete_publisher( const Publisher* publisher); /** @@ -232,7 +232,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Subscriber. */ - RTPS_DllAPI Subscriber* create_subscriber( + FASTDDS_EXPORTED_API Subscriber* create_subscriber( const SubscriberQos& qos, SubscriberListener* listener = nullptr, const StatusMask& mask = StatusMask::all()); @@ -245,7 +245,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Subscriber. */ - RTPS_DllAPI Subscriber* create_subscriber_with_profile( + FASTDDS_EXPORTED_API Subscriber* create_subscriber_with_profile( const std::string& profile_name, SubscriberListener* listener = nullptr, const StatusMask& mask = StatusMask::all()); @@ -257,7 +257,7 @@ class DomainParticipant : public Entity * @return RETCODE_PRECONDITION_NOT_MET if the subscriber does not belong to this participant or if it has active DataReaders, * RETCODE_OK if it is correctly deleted and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t delete_subscriber( + FASTDDS_EXPORTED_API ReturnCode_t delete_subscriber( const Subscriber* subscriber); /** @@ -270,7 +270,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Topic. */ - RTPS_DllAPI Topic* create_topic( + FASTDDS_EXPORTED_API Topic* create_topic( const std::string& topic_name, const std::string& type_name, const TopicQos& qos, @@ -287,7 +287,7 @@ class DomainParticipant : public Entity * @param mask StatusMask that holds statuses the listener responds to (default: all) * @return Pointer to the created Topic. */ - RTPS_DllAPI Topic* create_topic_with_profile( + FASTDDS_EXPORTED_API Topic* create_topic_with_profile( const std::string& topic_name, const std::string& type_name, const std::string& profile_name, @@ -301,7 +301,7 @@ class DomainParticipant : public Entity * @return RETCODE_BAD_PARAMETER if the topic passed is a nullptr, RETCODE_PRECONDITION_NOT_MET if the topic does not belong to * this participant or if it is referenced by any entity and RETCODE_OK if the Topic was deleted. */ - RTPS_DllAPI ReturnCode_t delete_topic( + FASTDDS_EXPORTED_API ReturnCode_t delete_topic( const Topic* topic); /** @@ -317,7 +317,7 @@ class DomainParticipant : public Entity * @return nullptr if a filter cannot be created with the specified @c filter_expression and * @c expression_parameters. */ - RTPS_DllAPI ContentFilteredTopic* create_contentfilteredtopic( + FASTDDS_EXPORTED_API ContentFilteredTopic* create_contentfilteredtopic( const std::string& name, Topic* related_topic, const std::string& filter_expression, @@ -339,7 +339,7 @@ class DomainParticipant : public Entity * @c expression_parameters. * @return nullptr if the specified @c filter_class_name has not been registered. */ - RTPS_DllAPI ContentFilteredTopic* create_contentfilteredtopic( + FASTDDS_EXPORTED_API ContentFilteredTopic* create_contentfilteredtopic( const std::string& name, Topic* related_topic, const std::string& filter_expression, @@ -353,7 +353,7 @@ class DomainParticipant : public Entity * @return RETCODE_BAD_PARAMETER if the topic passed is a nullptr, RETCODE_PRECONDITION_NOT_MET if the topic does not belong to * this participant or if it is referenced by any entity and RETCODE_OK if the ContentFilteredTopic was deleted. */ - RTPS_DllAPI ReturnCode_t delete_contentfilteredtopic( + FASTDDS_EXPORTED_API ReturnCode_t delete_contentfilteredtopic( const ContentFilteredTopic* a_contentfilteredtopic); /** @@ -365,7 +365,7 @@ class DomainParticipant : public Entity * @param expression_parameters Parameters to subscription content * @return Pointer to the created ContentFilteredTopic, nullptr in error case */ - RTPS_DllAPI MultiTopic* create_multitopic( + FASTDDS_EXPORTED_API MultiTopic* create_multitopic( const std::string& name, const std::string& type_name, const std::string& subscription_expression, @@ -381,7 +381,7 @@ class DomainParticipant : public Entity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED * */ - RTPS_DllAPI ReturnCode_t delete_multitopic( + FASTDDS_EXPORTED_API ReturnCode_t delete_multitopic( const MultiTopic* a_multitopic); /** @@ -397,7 +397,7 @@ class DomainParticipant : public Entity * @param timeout Maximum time to wait for the Topic * @return Pointer to the existing Topic, nullptr in case of error or timeout */ - RTPS_DllAPI Topic* find_topic( + FASTDDS_EXPORTED_API Topic* find_topic( const std::string& topic_name, const fastrtps::Duration_t& timeout); @@ -410,7 +410,7 @@ class DomainParticipant : public Entity * * @remark UNSAFE. It is unsafe to lookup a topic description while another thread is creating a topic. */ - RTPS_DllAPI TopicDescription* lookup_topicdescription( + FASTDDS_EXPORTED_API TopicDescription* lookup_topicdescription( const std::string& topic_name) const; /** @@ -418,7 +418,7 @@ class DomainParticipant : public Entity * * @return Pointer to the builtin Subscriber, nullptr in error case */ - RTPS_DllAPI const Subscriber* get_builtin_subscriber() const; + FASTDDS_EXPORTED_API const Subscriber* get_builtin_subscriber() const; /** * Locally ignore a remote domain participant. @@ -429,7 +429,7 @@ class DomainParticipant : public Entity * @return RETURN_OK code if everything correct, RETCODE_BAD_PARAMENTER otherwise * */ - RTPS_DllAPI ReturnCode_t ignore_participant( + FASTDDS_EXPORTED_API ReturnCode_t ignore_participant( const InstanceHandle_t& handle); /** @@ -443,7 +443,7 @@ class DomainParticipant : public Entity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED * */ - RTPS_DllAPI ReturnCode_t ignore_topic( + FASTDDS_EXPORTED_API ReturnCode_t ignore_topic( const InstanceHandle_t& handle); /** @@ -457,7 +457,7 @@ class DomainParticipant : public Entity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED * */ - RTPS_DllAPI ReturnCode_t ignore_publication( + FASTDDS_EXPORTED_API ReturnCode_t ignore_publication( const InstanceHandle_t& handle); /** @@ -471,7 +471,7 @@ class DomainParticipant : public Entity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED * */ - RTPS_DllAPI ReturnCode_t ignore_subscription( + FASTDDS_EXPORTED_API ReturnCode_t ignore_subscription( const InstanceHandle_t& handle); /** @@ -480,14 +480,14 @@ class DomainParticipant : public Entity * * @return The Participant's domain_id */ - RTPS_DllAPI DomainId_t get_domain_id() const; + FASTDDS_EXPORTED_API DomainId_t get_domain_id() const; /** * Deletes all the entities that were created by means of the “create” methods * * @return RETURN_OK code if everything correct, error code otherwise */ - RTPS_DllAPI ReturnCode_t delete_contained_entities(); + FASTDDS_EXPORTED_API ReturnCode_t delete_contained_entities(); /** * This operation manually asserts the liveliness of the DomainParticipant. @@ -504,7 +504,7 @@ class DomainParticipant : public Entity * * @return RETCODE_OK if the liveliness was asserted, RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t assert_liveliness(); + FASTDDS_EXPORTED_API ReturnCode_t assert_liveliness(); /** * This operation sets a default value of the Publisher QoS policies which will be used for newly created @@ -520,7 +520,7 @@ class DomainParticipant : public Entity * @param qos PublisherQos to be set * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_publisher_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_publisher_qos( const PublisherQos& qos); /** @@ -533,7 +533,7 @@ class DomainParticipant : public Entity * * @return Current default publisher qos. */ - RTPS_DllAPI const PublisherQos& get_default_publisher_qos() const; + FASTDDS_EXPORTED_API const PublisherQos& get_default_publisher_qos() const; /** * This operation retrieves the default value of the Publisher QoS, that is, the QoS policies which will be used @@ -546,7 +546,7 @@ class DomainParticipant : public Entity * @param qos PublisherQos reference where the default_publisher_qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_publisher_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_publisher_qos( PublisherQos& qos) const; /** @@ -556,7 +556,7 @@ class DomainParticipant : public Entity * @param qos PublisherQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_publisher_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_publisher_qos_from_profile( const std::string& profile_name, PublisherQos& qos) const; @@ -574,7 +574,7 @@ class DomainParticipant : public Entity * @param qos SubscriberQos to be set * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_subscriber_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_subscriber_qos( const SubscriberQos& qos); /** @@ -587,7 +587,7 @@ class DomainParticipant : public Entity * * @return Current default subscriber qos. */ - RTPS_DllAPI const SubscriberQos& get_default_subscriber_qos() const; + FASTDDS_EXPORTED_API const SubscriberQos& get_default_subscriber_qos() const; /** * This operation retrieves the default value of the Subscriber QoS, that is, the QoS policies which will be used @@ -600,7 +600,7 @@ class DomainParticipant : public Entity * @param qos SubscriberQos reference where the default_subscriber_qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_subscriber_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_subscriber_qos( SubscriberQos& qos) const; /** @@ -610,7 +610,7 @@ class DomainParticipant : public Entity * @param qos SubscriberQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_subscriber_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_subscriber_qos_from_profile( const std::string& profile_name, SubscriberQos& qos) const; @@ -628,7 +628,7 @@ class DomainParticipant : public Entity * @param qos TopicQos to be set * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_topic_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_topic_qos( const TopicQos& qos); /** @@ -641,7 +641,7 @@ class DomainParticipant : public Entity * * @return Current default topic qos. */ - RTPS_DllAPI const TopicQos& get_default_topic_qos() const; + FASTDDS_EXPORTED_API const TopicQos& get_default_topic_qos() const; /** * This operation retrieves the default value of the Topic QoS, that is, the QoS policies that will be used @@ -654,7 +654,7 @@ class DomainParticipant : public Entity * @param qos TopicQos reference where the default_topic_qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_topic_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_topic_qos( TopicQos& qos) const; /** @@ -664,7 +664,7 @@ class DomainParticipant : public Entity * @param qos TopicQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_topic_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_topic_qos_from_profile( const std::string& profile_name, TopicQos& qos) const; @@ -675,7 +675,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if everything correct, error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_discovered_participants( + FASTDDS_EXPORTED_API ReturnCode_t get_discovered_participants( std::vector& participant_handles) const; /** @@ -686,7 +686,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if everything correct, PRECONDITION_NOT_MET if participant does not exist * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_discovered_participant_data( + FASTDDS_EXPORTED_API ReturnCode_t get_discovered_participant_data( builtin::ParticipantBuiltinTopicData& participant_data, const InstanceHandle_t& participant_handle) const; @@ -697,7 +697,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK if everything correct, error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_discovered_topics( + FASTDDS_EXPORTED_API ReturnCode_t get_discovered_topics( std::vector& topic_handles) const; /** @@ -709,7 +709,7 @@ class DomainParticipant : public Entity * * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_discovered_topic_data( + FASTDDS_EXPORTED_API ReturnCode_t get_discovered_topic_data( builtin::TopicBuiltinTopicData& topic_data, const InstanceHandle_t& topic_handle) const; @@ -723,7 +723,7 @@ class DomainParticipant : public Entity * entities created using a contained Publisher, or Subscriber as the factory, and so forth. (default: true) * @return True if entity is contained. False otherwise. */ - RTPS_DllAPI bool contains_entity( + FASTDDS_EXPORTED_API bool contains_entity( const InstanceHandle_t& a_handle, bool recursive = true) const; @@ -734,7 +734,7 @@ class DomainParticipant : public Entity * @param current_time Time_t reference where the current time is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_current_time( + FASTDDS_EXPORTED_API ReturnCode_t get_current_time( fastrtps::Time_t& current_time) const; // DomainParticipant methods specific from Fast DDS @@ -747,7 +747,7 @@ class DomainParticipant : public Entity * @return RETCODE_BAD_PARAMETER if the size of the name is 0, RERCODE_PRECONDITION_NOT_MET if there is another TypeSupport * with the same name and RETCODE_OK if it is correctly registered. */ - RTPS_DllAPI ReturnCode_t register_type( + FASTDDS_EXPORTED_API ReturnCode_t register_type( TypeSupport type, const std::string& type_name); @@ -758,7 +758,7 @@ class DomainParticipant : public Entity * @return RETCODE_BAD_PARAMETER if the size of the name is 0, RERCODE_PRECONDITION_NOT_MET if there is another TypeSupport * with the same name and RETCODE_OK if it is correctly registered. */ - RTPS_DllAPI ReturnCode_t register_type( + FASTDDS_EXPORTED_API ReturnCode_t register_type( TypeSupport type); /** @@ -768,7 +768,7 @@ class DomainParticipant : public Entity * @return RETCODE_BAD_PARAMETER if the size of the name is 0, RERCODE_PRECONDITION_NOT_MET if there are entities using that * TypeSupport and RETCODE_OK if it is correctly unregistered. */ - RTPS_DllAPI ReturnCode_t unregister_type( + FASTDDS_EXPORTED_API ReturnCode_t unregister_type( const std::string& typeName); /** @@ -777,7 +777,7 @@ class DomainParticipant : public Entity * @param type_name Name of the type * @return TypeSupport corresponding to the type_name */ - RTPS_DllAPI TypeSupport find_type( + FASTDDS_EXPORTED_API TypeSupport find_type( const std::string& type_name) const; /** @@ -785,7 +785,7 @@ class DomainParticipant : public Entity * * @return InstanceHandle of this DomainParticipant. */ - RTPS_DllAPI const InstanceHandle_t& get_instance_handle() const; + FASTDDS_EXPORTED_API const InstanceHandle_t& get_instance_handle() const; // From here legacy RTPS methods. @@ -794,14 +794,14 @@ class DomainParticipant : public Entity * * @return A reference to the GUID */ - RTPS_DllAPI const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; /** * @brief Getter for the participant names * * @return Vector with the names */ - RTPS_DllAPI std::vector get_participant_names() const; + FASTDDS_EXPORTED_API std::vector get_participant_names() const; /** * This method can be used when using a StaticEndpointDiscovery mechanism different that the one @@ -814,7 +814,7 @@ class DomainParticipant : public Entity * @param kind EndpointKind (WRITER or READER) * @return True if correctly found and activated. */ - RTPS_DllAPI bool new_remote_endpoint_discovered( + FASTDDS_EXPORTED_API bool new_remote_endpoint_discovered( const fastrtps::rtps::GUID_t& partguid, uint16_t userId, fastrtps::rtps::EndpointKind_t kind); @@ -826,7 +826,7 @@ class DomainParticipant : public Entity * * @return A reference to the resource event */ - RTPS_DllAPI fastrtps::rtps::ResourceEvent& get_resource_event() const; + FASTDDS_EXPORTED_API fastrtps::rtps::ResourceEvent& get_resource_event() const; /** * When a DomainParticipant receives an incomplete list of TypeIdentifiers in a @@ -836,7 +836,7 @@ class DomainParticipant : public Entity * @param in TypeIdentifier sequence * @return SampleIdentity */ - RTPS_DllAPI fastrtps::rtps::SampleIdentity get_type_dependencies( + FASTDDS_EXPORTED_API fastrtps::rtps::SampleIdentity get_type_dependencies( const fastrtps::types::TypeIdentifierSeq& in) const; /** @@ -846,7 +846,7 @@ class DomainParticipant : public Entity * @param in TypeIdentifier sequence * @return SampleIdentity */ - RTPS_DllAPI fastrtps::rtps::SampleIdentity get_types( + FASTDDS_EXPORTED_API fastrtps::rtps::SampleIdentity get_types( const fastrtps::types::TypeIdentifierSeq& in) const; /** @@ -866,7 +866,7 @@ class DomainParticipant : public Entity * @return RETCODE_NOT_ENABLED if the DomainParticipant is not enabled. * @return RETCODE_PRECONDITION_NOT_MET if the DomainParticipant type lookup service is disabled. */ - RTPS_DllAPI ReturnCode_t register_remote_type( + FASTDDS_EXPORTED_API ReturnCode_t register_remote_type( const fastrtps::types::TypeInformation& type_information, const std::string& type_name, std::function& callback); @@ -901,7 +901,7 @@ class DomainParticipant : public Entity * @return RETCODE_PRECONDITION_NOT_MET if filter_class_name is FASTDDS_SQLFILTER_NAME. * @return RETCODE_OK if the filter is correctly registered. */ - RTPS_DllAPI ReturnCode_t register_content_filter_factory( + FASTDDS_EXPORTED_API ReturnCode_t register_content_filter_factory( const char* filter_class_name, IContentFilterFactory* const filter_factory); @@ -913,7 +913,7 @@ class DomainParticipant : public Entity * @return nullptr if the given filter_class_name has not been previously registered on this DomainParticipant. * Otherwise, the content filter factory previously registered with the given filter_class_name. */ - RTPS_DllAPI IContentFilterFactory* lookup_content_filter_factory( + FASTDDS_EXPORTED_API IContentFilterFactory* lookup_content_filter_factory( const char* filter_class_name); /** @@ -935,7 +935,7 @@ class DomainParticipant : public Entity * @return RERCODE_PRECONDITION_NOT_MET if there is any ContentFilteredTopic referencing the filter. * @return RETCODE_OK if the filter is correctly unregistered. */ - RTPS_DllAPI ReturnCode_t unregister_content_filter_factory( + FASTDDS_EXPORTED_API ReturnCode_t unregister_content_filter_factory( const char* filter_class_name); /** diff --git a/include/fastdds/dds/domain/DomainParticipantFactory.hpp b/include/fastdds/dds/domain/DomainParticipantFactory.hpp index 3346cbf01b6..cb13568e001 100644 --- a/include/fastdds/dds/domain/DomainParticipantFactory.hpp +++ b/include/fastdds/dds/domain/DomainParticipantFactory.hpp @@ -72,14 +72,14 @@ class DomainParticipantFactory * * @return A raw pointer to the DomainParticipantFactory singleton instance. */ - RTPS_DllAPI static DomainParticipantFactory* get_instance(); + FASTDDS_EXPORTED_API static DomainParticipantFactory* get_instance(); /** * Returns the DomainParticipantFactory singleton instance. * * @return A shared pointer to the DomainParticipantFactory singleton instance. */ - RTPS_DllAPI static std::shared_ptr get_shared_instance(); + FASTDDS_EXPORTED_API static std::shared_ptr get_shared_instance(); /** * Create a Participant. @@ -90,7 +90,7 @@ class DomainParticipantFactory * @param mask StatusMask Reference (default: all) * @return DomainParticipant pointer. (nullptr if not created.) */ - RTPS_DllAPI DomainParticipant* create_participant( + FASTDDS_EXPORTED_API DomainParticipant* create_participant( DomainId_t domain_id, const DomainParticipantQos& qos, DomainParticipantListener* listener = nullptr, @@ -105,7 +105,7 @@ class DomainParticipantFactory * @param mask StatusMask Reference (default: all) * @return DomainParticipant pointer. (nullptr if not created.) */ - RTPS_DllAPI DomainParticipant* create_participant_with_profile( + FASTDDS_EXPORTED_API DomainParticipant* create_participant_with_profile( DomainId_t domain_id, const std::string& profile_name, DomainParticipantListener* listener = nullptr, @@ -119,7 +119,7 @@ class DomainParticipantFactory * @param mask StatusMask Reference (default: all) * @return DomainParticipant pointer. (nullptr if not created.) */ - RTPS_DllAPI DomainParticipant* create_participant_with_profile( + FASTDDS_EXPORTED_API DomainParticipant* create_participant_with_profile( const std::string& profile_name, DomainParticipantListener* listener = nullptr, const StatusMask& mask = StatusMask::all()); @@ -133,7 +133,7 @@ class DomainParticipantFactory * @param domain_id * @return previously created DomainParticipant within the specified domain */ - RTPS_DllAPI DomainParticipant* lookup_participant( + FASTDDS_EXPORTED_API DomainParticipant* lookup_participant( DomainId_t domain_id) const; /** @@ -142,7 +142,7 @@ class DomainParticipantFactory * @param domain_id * @return previously created DomainParticipants within the specified domain */ - RTPS_DllAPI std::vector lookup_participants( + FASTDDS_EXPORTED_API std::vector lookup_participants( DomainId_t domain_id) const; /** @@ -155,7 +155,7 @@ class DomainParticipantFactory * @param qos DomainParticipantQos where the qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_participant_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_participant_qos( DomainParticipantQos& qos) const; /** @@ -167,7 +167,7 @@ class DomainParticipantFactory * * @return A reference to the default DomainParticipantQos */ - RTPS_DllAPI const DomainParticipantQos& get_default_participant_qos() const; + FASTDDS_EXPORTED_API const DomainParticipantQos& get_default_participant_qos() const; /** * @brief This operation sets a default value of the DomainParticipant QoS policies which will be used for @@ -184,7 +184,7 @@ class DomainParticipantFactory * @param qos DomainParticipantQos to be set * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_participant_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_participant_qos( const DomainParticipantQos& qos); /** @@ -194,7 +194,7 @@ class DomainParticipantFactory * @param qos DomainParticipantQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_participant_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_participant_qos_from_profile( const std::string& profile_name, DomainParticipantQos& qos) const; @@ -205,7 +205,7 @@ class DomainParticipantFactory * @return RETCODE_PRECONDITION_NOT_MET if the participant has active entities, RETCODE_OK if the participant is correctly * deleted and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t delete_participant( + FASTDDS_EXPORTED_API ReturnCode_t delete_participant( DomainParticipant* part); /** @@ -213,7 +213,7 @@ class DomainParticipantFactory * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t load_profiles(); + FASTDDS_EXPORTED_API ReturnCode_t load_profiles(); /** * Load profiles from XML file. @@ -221,7 +221,7 @@ class DomainParticipantFactory * @param xml_profile_file XML profile file. * @return RETCODE_OK if it is correctly loaded, RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t load_XML_profiles_file( + FASTDDS_EXPORTED_API ReturnCode_t load_XML_profiles_file( const std::string& xml_profile_file); /** @@ -231,7 +231,7 @@ class DomainParticipantFactory * @param length length of data * @return RETCODE_OK if it is correctly loaded, RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t load_XML_profiles_string( + FASTDDS_EXPORTED_API ReturnCode_t load_XML_profiles_string( const char* data, size_t length); @@ -241,7 +241,7 @@ class DomainParticipantFactory * @param xml_file xml file path * @return RETCODE_OK if the validation is successful, RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t check_xml_static_discovery( + FASTDDS_EXPORTED_API ReturnCode_t check_xml_static_discovery( std::string& xml_file); /** @@ -250,7 +250,7 @@ class DomainParticipantFactory * @param qos DomaParticipantFactoryQos reference where the qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( DomainParticipantFactoryQos& qos) const; /** @@ -266,7 +266,7 @@ class DomainParticipantFactory * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is not * self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const DomainParticipantFactoryQos& qos); /** @@ -275,7 +275,7 @@ class DomainParticipantFactory * @param library_settings LibrarySettings reference where the settings are returned. * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_library_settings( + FASTDDS_EXPORTED_API ReturnCode_t get_library_settings( LibrarySettings& library_settings) const; /** @@ -288,7 +288,7 @@ class DomainParticipantFactory * @return RETCODE_PRECONDITION_NOT_MET if any DomainParticipant is already enabled. * RETCODE_OK otherwise. */ - RTPS_DllAPI ReturnCode_t set_library_settings( + FASTDDS_EXPORTED_API ReturnCode_t set_library_settings( const LibrarySettings& library_settings); /** @@ -301,7 +301,7 @@ class DomainParticipantFactory * RETCODE_NO_DATA if type_name is unknown. * RETCODE_OK otherwise. */ - RTPS_DllAPI ReturnCode_t get_dynamic_type_builder_from_xml_by_name( + FASTDDS_EXPORTED_API ReturnCode_t get_dynamic_type_builder_from_xml_by_name( const std::string& type_name, fastrtps::types::DynamicTypeBuilder*& type); diff --git a/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp b/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp index 12e46cc1535..be0c1c1ccef 100644 --- a/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp +++ b/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -40,14 +40,14 @@ class DomainParticipantFactoryQos /** * @brief Constructor */ - RTPS_DllAPI DomainParticipantFactoryQos() + FASTDDS_EXPORTED_API DomainParticipantFactoryQos() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~DomainParticipantFactoryQos() + FASTDDS_EXPORTED_API virtual ~DomainParticipantFactoryQos() { } @@ -162,7 +162,7 @@ class DomainParticipantFactoryQos }; -RTPS_DllAPI extern const DomainParticipantFactoryQos PARTICIPANT_FACTORY_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const DomainParticipantFactoryQos PARTICIPANT_FACTORY_QOS_DEFAULT; } /* namespace dds */ } /* namespace fastdds */ diff --git a/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp b/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp index 1c958fad590..b463aa03e0c 100644 --- a/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp +++ b/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -52,7 +52,7 @@ class DomainParticipantQos /** * @brief Constructor */ - RTPS_DllAPI DomainParticipantQos() + FASTDDS_EXPORTED_API DomainParticipantQos() { #ifdef FASTDDS_STATISTICS /* @@ -69,7 +69,7 @@ class DomainParticipantQos /** * @brief Destructor */ - RTPS_DllAPI virtual ~DomainParticipantQos() + FASTDDS_EXPORTED_API virtual ~DomainParticipantQos() { } @@ -356,7 +356,7 @@ class DomainParticipantQos * @param transports Defines the transport configuration scenario to setup. * @param options Defines the options to be used in the transport configuration. */ - RTPS_DllAPI void setup_transports( + FASTDDS_EXPORTED_API void setup_transports( rtps::BuiltinTransports transports, const rtps::BuiltinTransportsOptions& options = rtps::BuiltinTransportsOptions()); @@ -512,7 +512,7 @@ class DomainParticipantQos }; -RTPS_DllAPI extern const DomainParticipantQos PARTICIPANT_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const DomainParticipantQos PARTICIPANT_QOS_DEFAULT; } /* namespace dds */ diff --git a/include/fastdds/dds/log/FileConsumer.hpp b/include/fastdds/dds/log/FileConsumer.hpp index a8f0e3a76b3..7bafbe1844a 100644 --- a/include/fastdds/dds/log/FileConsumer.hpp +++ b/include/fastdds/dds/log/FileConsumer.hpp @@ -39,13 +39,13 @@ class FileConsumer : public OStreamConsumer public: //! Default constructor: filename = "output.log", append = false. - RTPS_DllAPI FileConsumer(); + FASTDDS_EXPORTED_API FileConsumer(); /** Constructor with parameters. * @param filename path of the output file where the log will be wrote. * @param append indicates if the consumer must append the content in the filename. */ - RTPS_DllAPI FileConsumer( + FASTDDS_EXPORTED_API FileConsumer( const std::string& filename, bool append = false); @@ -57,7 +57,7 @@ class FileConsumer : public OStreamConsumer * Called by Log consume to get the correct stream * @param entry Log::Entry to consume. */ - RTPS_DllAPI virtual std::ostream& get_stream( + FASTDDS_EXPORTED_API virtual std::ostream& get_stream( const Log::Entry& entry) override; std::string output_file_; diff --git a/include/fastdds/dds/log/Log.hpp b/include/fastdds/dds/log/Log.hpp index 3ad9e655201..50c4daf31e5 100644 --- a/include/fastdds/dds/log/Log.hpp +++ b/include/fastdds/dds/log/Log.hpp @@ -19,7 +19,7 @@ #include #include -#include +#include /** * eProsima log layer. Logging categories and verbosity can be specified dynamically at runtime. @@ -98,51 +98,51 @@ class Log * There is a default stdout consumer active as default. * @param consumer r-value to a consumer unique_ptr. It will be invalidated after the call. */ - RTPS_DllAPI static void RegisterConsumer( + FASTDDS_EXPORTED_API static void RegisterConsumer( std::unique_ptr&& consumer); //! Removes all registered consumers, including the default stdout. - RTPS_DllAPI static void ClearConsumers(); + FASTDDS_EXPORTED_API static void ClearConsumers(); //! Enables the reporting of filenames in log entries. Disabled by default. - RTPS_DllAPI static void ReportFilenames( + FASTDDS_EXPORTED_API static void ReportFilenames( bool); //! Enables the reporting of function names in log entries. Enabled by default when supported. - RTPS_DllAPI static void ReportFunctions( + FASTDDS_EXPORTED_API static void ReportFunctions( bool); //! Sets the verbosity level, allowing for messages equal or under that priority to be logged. - RTPS_DllAPI static void SetVerbosity( + FASTDDS_EXPORTED_API static void SetVerbosity( Log::Kind); //! Returns the current verbosity level. - RTPS_DllAPI static Log::Kind GetVerbosity(); + FASTDDS_EXPORTED_API static Log::Kind GetVerbosity(); //! Sets a filter that will pattern-match against log categories, dropping any unmatched categories. - RTPS_DllAPI static void SetCategoryFilter( + FASTDDS_EXPORTED_API static void SetCategoryFilter( const std::regex&); //! Sets a filter that will pattern-match against filenames, dropping any unmatched categories. - RTPS_DllAPI static void SetFilenameFilter( + FASTDDS_EXPORTED_API static void SetFilenameFilter( const std::regex&); //! Sets a filter that will pattern-match against the provided error string, dropping any unmatched categories. - RTPS_DllAPI static void SetErrorStringFilter( + FASTDDS_EXPORTED_API static void SetErrorStringFilter( const std::regex&); //! Sets thread configuration for the logging thread. - RTPS_DllAPI static void SetThreadConfig( + FASTDDS_EXPORTED_API static void SetThreadConfig( const rtps::ThreadSettings&); //! Returns the logging engine to configuration defaults. - RTPS_DllAPI static void Reset(); + FASTDDS_EXPORTED_API static void Reset(); //! Waits until all info logged up to the call time is consumed - RTPS_DllAPI static void Flush(); + FASTDDS_EXPORTED_API static void Flush(); //! Stops the logging thread. It will re-launch on the next call to a successful log macro. - RTPS_DllAPI static void KillThread(); + FASTDDS_EXPORTED_API static void KillThread(); // Note: In VS2013, if you're linking this class statically, you will have to call KillThread before leaving // main, due to an unsolved MSVC bug. @@ -172,7 +172,7 @@ class Log * @todo this method takes 2 mutexes (same mutex) internally. * This is a very high sensible point of the code and it should be refactored to be as efficient as possible. */ - RTPS_DllAPI static void QueueLog( + FASTDDS_EXPORTED_API static void QueueLog( const std::string& message, const Log::Context&, Log::Kind); @@ -218,27 +218,27 @@ class LogConsumer protected: - RTPS_DllAPI void print_timestamp( + FASTDDS_EXPORTED_API void print_timestamp( std::ostream& stream, const Log::Entry&, bool color) const; - RTPS_DllAPI void print_header( + FASTDDS_EXPORTED_API void print_header( std::ostream& stream, const Log::Entry&, bool color) const; - RTPS_DllAPI void print_context( + FASTDDS_EXPORTED_API void print_context( std::ostream& stream, const Log::Entry&, bool color) const; - RTPS_DllAPI void print_message( + FASTDDS_EXPORTED_API void print_message( std::ostream& stream, const Log::Entry&, bool color) const; - RTPS_DllAPI void print_new_line( + FASTDDS_EXPORTED_API void print_new_line( std::ostream& stream, bool color) const; }; diff --git a/include/fastdds/dds/log/OStreamConsumer.hpp b/include/fastdds/dds/log/OStreamConsumer.hpp index b8a5a1c1cda..50550671b28 100644 --- a/include/fastdds/dds/log/OStreamConsumer.hpp +++ b/include/fastdds/dds/log/OStreamConsumer.hpp @@ -38,7 +38,7 @@ class OStreamConsumer : public LogConsumer * Called by Log to ask us to consume the Entry. * @param Log::Entry to consume. */ - RTPS_DllAPI void Consume( + FASTDDS_EXPORTED_API void Consume( const Log::Entry& entry) override; protected: @@ -47,7 +47,7 @@ class OStreamConsumer : public LogConsumer * Called by Log consume to get the correct stream * @param Log::Entry to consume. */ - RTPS_DllAPI virtual std::ostream& get_stream( + FASTDDS_EXPORTED_API virtual std::ostream& get_stream( const Log::Entry& entry) = 0; }; diff --git a/include/fastdds/dds/log/StdoutConsumer.hpp b/include/fastdds/dds/log/StdoutConsumer.hpp index 1c7e304a6ac..f1a73f443a7 100644 --- a/include/fastdds/dds/log/StdoutConsumer.hpp +++ b/include/fastdds/dds/log/StdoutConsumer.hpp @@ -34,7 +34,7 @@ class StdoutConsumer : public OStreamConsumer * Called by Log consume to get the correct stream * @param Log::Entry to consume. */ - RTPS_DllAPI virtual std::ostream& get_stream( + FASTDDS_EXPORTED_API virtual std::ostream& get_stream( const Log::Entry& entry) override; }; diff --git a/include/fastdds/dds/log/StdoutErrConsumer.hpp b/include/fastdds/dds/log/StdoutErrConsumer.hpp index 1464645058a..1f71506f420 100644 --- a/include/fastdds/dds/log/StdoutErrConsumer.hpp +++ b/include/fastdds/dds/log/StdoutErrConsumer.hpp @@ -44,14 +44,14 @@ class StdoutErrConsumer : public OStreamConsumer * std::cout. * @param kind The Log::Kind to which stderr_threshold is set. */ - RTPS_DllAPI virtual void stderr_threshold( + FASTDDS_EXPORTED_API virtual void stderr_threshold( const Log::Kind& kind); /** * @brief Retrieve the stderr_threshold. * @return The Log::Kind to which stderr_threshold is set. */ - RTPS_DllAPI virtual Log::Kind stderr_threshold() const; + FASTDDS_EXPORTED_API virtual Log::Kind stderr_threshold() const; /** * @brief Default value of stderr_threshold. @@ -64,7 +64,7 @@ class StdoutErrConsumer : public OStreamConsumer * Called by Log consume to get the correct stream * @param Log::Entry to consume. */ - RTPS_DllAPI virtual std::ostream& get_stream( + FASTDDS_EXPORTED_API virtual std::ostream& get_stream( const Log::Entry& entry) override; private: diff --git a/include/fastdds/dds/publisher/DataWriter.hpp b/include/fastdds/dds/publisher/DataWriter.hpp index 6ba2f52506b..8e3407361d3 100644 --- a/include/fastdds/dds/publisher/DataWriter.hpp +++ b/include/fastdds/dds/publisher/DataWriter.hpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -126,7 +126,7 @@ class DataWriter : public DomainEntity * @return RETCODE_OK is successfully enabled. RETCODE_PRECONDITION_NOT_MET if the Publisher creating this * DataWriter is not enabled. */ - RTPS_DllAPI ReturnCode_t enable() override; + FASTDDS_EXPORTED_API ReturnCode_t enable() override; /** * Write data to the topic. @@ -134,7 +134,7 @@ class DataWriter : public DomainEntity * @param data Pointer to the data * @return True if correct, false otherwise */ - RTPS_DllAPI bool write( + FASTDDS_EXPORTED_API bool write( void* data); /** @@ -144,7 +144,7 @@ class DataWriter : public DomainEntity * @param params Extra write parameters. * @return True if correct, false otherwise */ - RTPS_DllAPI bool write( + FASTDDS_EXPORTED_API bool write( void* data, fastrtps::rtps::WriteParams& params); @@ -159,7 +159,7 @@ class DataWriter : public DomainEntity * @return RETCODE_PRECONDITION_NOT_MET if the handle introduced does not match with the one associated to the data, * RETCODE_OK if the data is correctly sent and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t write( + FASTDDS_EXPORTED_API ReturnCode_t write( void* data, const InstanceHandle_t& handle); @@ -179,7 +179,7 @@ class DataWriter : public DomainEntity * @param timestamp Time_t used to set the source_timestamp. * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t write_w_timestamp( + FASTDDS_EXPORTED_API ReturnCode_t write_w_timestamp( void* data, const InstanceHandle_t& handle, const fastrtps::Time_t& timestamp); @@ -193,7 +193,7 @@ class DataWriter : public DomainEntity * This handle could be used in successive `write` or `dispose` operations. * In case of error, HANDLE_NIL will be returned. */ - RTPS_DllAPI InstanceHandle_t register_instance( + FASTDDS_EXPORTED_API InstanceHandle_t register_instance( void* instance); /** @@ -214,7 +214,7 @@ class DataWriter : public DomainEntity * @param timestamp Time_t used to set the source_timestamp. * @return Handle containing the instance's key. */ - RTPS_DllAPI InstanceHandle_t register_instance_w_timestamp( + FASTDDS_EXPORTED_API InstanceHandle_t register_instance_w_timestamp( void* instance, const fastrtps::Time_t& timestamp); @@ -229,7 +229,7 @@ class DataWriter : public DomainEntity * @return Returns the operation's result. * If the operation finishes successfully, ReturnCode_t::RETCODE_OK is returned. */ - RTPS_DllAPI ReturnCode_t unregister_instance( + FASTDDS_EXPORTED_API ReturnCode_t unregister_instance( void* instance, const InstanceHandle_t& handle); @@ -252,7 +252,7 @@ class DataWriter : public DomainEntity * @param timestamp Time_t used to set the source_timestamp. * @return Handle containing the instance's key. */ - RTPS_DllAPI ReturnCode_t unregister_instance_w_timestamp( + FASTDDS_EXPORTED_API ReturnCode_t unregister_instance_w_timestamp( void* instance, const InstanceHandle_t& handle, const fastrtps::Time_t& timestamp); @@ -271,7 +271,7 @@ class DataWriter : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t get_key_value( + FASTDDS_EXPORTED_API ReturnCode_t get_key_value( void* key_holder, const InstanceHandle_t& handle); @@ -286,7 +286,7 @@ class DataWriter : public DomainEntity * * @return handle of the given instance */ - RTPS_DllAPI InstanceHandle_t lookup_instance( + FASTDDS_EXPORTED_API InstanceHandle_t lookup_instance( const void* instance) const; /** @@ -294,21 +294,21 @@ class DataWriter : public DomainEntity * * @return Reference to the DataWriter GUID */ - RTPS_DllAPI const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; /** * Returns the DataWriter's InstanceHandle * * @return Copy of the DataWriter InstanceHandle */ - RTPS_DllAPI InstanceHandle_t get_instance_handle() const; + FASTDDS_EXPORTED_API InstanceHandle_t get_instance_handle() const; /** * Get data type associated to the DataWriter * * @return Copy of the TypeSupport */ - RTPS_DllAPI TypeSupport get_type() const; + FASTDDS_EXPORTED_API TypeSupport get_type() const; /** * Waits the current thread until all writers have received their acknowledgments. @@ -316,7 +316,7 @@ class DataWriter : public DomainEntity * @param max_wait Maximum blocking time for this operation * @return RETCODE_OK if the DataWriter receive the acknowledgments before the time expires and RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t wait_for_acknowledgments( + FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( const fastrtps::Duration_t& max_wait); /** @@ -325,7 +325,7 @@ class DataWriter : public DomainEntity * @param[out] status Deadline missed status struct * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_offered_deadline_missed_status( + FASTDDS_EXPORTED_API ReturnCode_t get_offered_deadline_missed_status( OfferedDeadlineMissedStatus& status); /** @@ -334,7 +334,7 @@ class DataWriter : public DomainEntity * @param[out] status Offered incompatible qos status struct * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_offered_incompatible_qos_status( + FASTDDS_EXPORTED_API ReturnCode_t get_offered_incompatible_qos_status( OfferedIncompatibleQosStatus& status); /** @@ -343,7 +343,7 @@ class DataWriter : public DomainEntity * @param[out] status publication matched status struct * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_publication_matched_status( + FASTDDS_EXPORTED_API ReturnCode_t get_publication_matched_status( PublicationMatchedStatus& status) const; /** @@ -353,7 +353,7 @@ class DataWriter : public DomainEntity * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is not * self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const DataWriterQos& qos); /** @@ -361,7 +361,7 @@ class DataWriter : public DomainEntity * * @return Reference to the current DataWriterQos */ - RTPS_DllAPI const DataWriterQos& get_qos() const; + FASTDDS_EXPORTED_API const DataWriterQos& get_qos() const; /** * Fills the DataWriterQos with the values of this DataWriter. @@ -369,7 +369,7 @@ class DataWriter : public DomainEntity * @param qos DataWriterQos object where the qos is returned. * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( DataWriterQos& qos) const; /** @@ -377,14 +377,14 @@ class DataWriter : public DomainEntity * * @return Pointer to the associated Topic */ - RTPS_DllAPI Topic* get_topic() const; + FASTDDS_EXPORTED_API Topic* get_topic() const; /** * Retrieves the listener for this DataWriter. * * @return Pointer to the DataWriterListener */ - RTPS_DllAPI const DataWriterListener* get_listener() const; + FASTDDS_EXPORTED_API const DataWriterListener* get_listener() const; /** * Modifies the DataWriterListener, sets the mask to StatusMask::all() @@ -392,7 +392,7 @@ class DataWriter : public DomainEntity * @param listener new value for the DataWriterListener * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DataWriterListener* listener); /** @@ -402,7 +402,7 @@ class DataWriter : public DomainEntity * @param mask StatusMask that holds statuses the listener responds to (default: all). * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DataWriterListener* listener, const StatusMask& mask); @@ -421,7 +421,7 @@ class DataWriter : public DomainEntity * @return RETCODE_PRECONDITION_NOT_MET if the handle introduced does not match with the one associated to the data, * RETCODE_OK if the data is correctly sent and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t dispose( + FASTDDS_EXPORTED_API ReturnCode_t dispose( void* data, const InstanceHandle_t& handle); @@ -443,9 +443,9 @@ class DataWriter : public DomainEntity * @param instance Sample used to deduce instance's key in case of `handle` parameter is HANDLE_NIL. * @param handle Instance's key to be disposed. * @param timestamp Time_t used to set the source_timestamp. - * @return RTPS_DllAPI + * @return FASTDDS_EXPORTED_API */ - RTPS_DllAPI ReturnCode_t dispose_w_timestamp( + FASTDDS_EXPORTED_API ReturnCode_t dispose_w_timestamp( void* instance, const InstanceHandle_t& handle, const fastrtps::Time_t& timestamp); @@ -455,7 +455,7 @@ class DataWriter : public DomainEntity * @param status Liveliness lost status struct * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_liveliness_lost_status( + FASTDDS_EXPORTED_API ReturnCode_t get_liveliness_lost_status( LivelinessLostStatus& status); /** @@ -463,7 +463,7 @@ class DataWriter : public DomainEntity * * @return Pointer to the Publisher */ - RTPS_DllAPI const Publisher* get_publisher() const; + FASTDDS_EXPORTED_API const Publisher* get_publisher() const; /** * @brief This operation manually asserts the liveliness of the DataWriter. This is used in combination with the @@ -477,7 +477,7 @@ class DataWriter : public DomainEntity * * @return RETCODE_OK if asserted, RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t assert_liveliness(); + FASTDDS_EXPORTED_API ReturnCode_t assert_liveliness(); /** * @brief Retrieves in a subscription associated with the DataWriter @@ -487,7 +487,7 @@ class DataWriter : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_matched_subscription_data( + FASTDDS_EXPORTED_API ReturnCode_t get_matched_subscription_data( builtin::SubscriptionBuiltinTopicData& subscription_data, const InstanceHandle_t& subscription_handle) const; @@ -498,7 +498,7 @@ class DataWriter : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_matched_subscriptions( + FASTDDS_EXPORTED_API ReturnCode_t get_matched_subscriptions( std::vector& subscription_handles) const; /** @@ -507,7 +507,7 @@ class DataWriter : public DomainEntity * @param removed size_t pointer to return the size of the data removed * @return RETCODE_OK if the samples are removed and RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t clear_history( + FASTDDS_EXPORTED_API ReturnCode_t clear_history( size_t* removed); /** @@ -535,7 +535,7 @@ class DataWriter : public DomainEntity * @return ReturnCode_t::RETCODE_OUT_OF_RESOURCES if the pool has been exhausted. * @return ReturnCode_t::RETCODE_OK if a pointer to a sample is successfully obtained. */ - RTPS_DllAPI ReturnCode_t loan_sample( + FASTDDS_EXPORTED_API ReturnCode_t loan_sample( void*& sample, LoanInitializationKind initialization = LoanInitializationKind::NO_LOAN_INITIALIZATION); @@ -551,7 +551,7 @@ class DataWriter : public DomainEntity * @return ReturnCode_t::RETCODE_BAD_PARAMETER if the pointer does not correspond to a loaned sample. * @return ReturnCode_t::RETCODE_OK if the loan is successfully discarded. */ - RTPS_DllAPI ReturnCode_t discard_loan( + FASTDDS_EXPORTED_API ReturnCode_t discard_loan( void*& sample); /** @@ -562,7 +562,7 @@ class DataWriter : public DomainEntity * @return NOT_ENABLED if the reader has not been enabled. * @return OK if a list of locators is returned. */ - RTPS_DllAPI ReturnCode_t get_sending_locators( + FASTDDS_EXPORTED_API ReturnCode_t get_sending_locators( rtps::LocatorList& locators) const; /** @@ -581,7 +581,7 @@ class DataWriter : public DomainEntity * @return RETCODE_OK if the DataWriter received the acknowledgments before the time expired. * @return RETCODE_TIMEOUT otherwise. */ - RTPS_DllAPI ReturnCode_t wait_for_acknowledgments( + FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( void* instance, const InstanceHandle_t& handle, const fastrtps::Duration_t& max_wait); diff --git a/include/fastdds/dds/publisher/DataWriterListener.hpp b/include/fastdds/dds/publisher/DataWriterListener.hpp index 15dc67c60c5..b75bf6bbcc1 100644 --- a/include/fastdds/dds/publisher/DataWriterListener.hpp +++ b/include/fastdds/dds/publisher/DataWriterListener.hpp @@ -35,7 +35,7 @@ class DataWriter; * Class DataWriterListener, allows the end user to implement callbacks triggered by certain events. * @ingroup FASTDDS_MODULE */ -class RTPS_DllAPI DataWriterListener +class FASTDDS_EXPORTED_API DataWriterListener { public: diff --git a/include/fastdds/dds/publisher/Publisher.hpp b/include/fastdds/dds/publisher/Publisher.hpp index 5006e144d9b..e3b5c62405a 100644 --- a/include/fastdds/dds/publisher/Publisher.hpp +++ b/include/fastdds/dds/publisher/Publisher.hpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -93,21 +93,21 @@ class Publisher : public DomainEntity * @return RETCODE_OK is successfully enabled. RETCODE_PRECONDITION_NOT_MET if the participant creating this * Publisher is not enabled. */ - RTPS_DllAPI ReturnCode_t enable() override; + FASTDDS_EXPORTED_API ReturnCode_t enable() override; /** * Allows accessing the Publisher Qos. * * @return PublisherQos reference */ - RTPS_DllAPI const PublisherQos& get_qos() const; + FASTDDS_EXPORTED_API const PublisherQos& get_qos() const; /** * Retrieves the Publisher Qos. * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( PublisherQos& qos) const; /** @@ -118,7 +118,7 @@ class Publisher : public DomainEntity * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is not * self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const PublisherQos& qos); /** @@ -126,7 +126,7 @@ class Publisher : public DomainEntity * * @return PublisherListener pointer */ - RTPS_DllAPI const PublisherListener* get_listener() const; + FASTDDS_EXPORTED_API const PublisherListener* get_listener() const; /** * Modifies the PublisherListener, sets the mask to StatusMask::all() @@ -134,7 +134,7 @@ class Publisher : public DomainEntity * @param listener new value for the PublisherListener * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( PublisherListener* listener); /** @@ -144,7 +144,7 @@ class Publisher : public DomainEntity * @param mask StatusMask that holds statuses the listener responds to * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( PublisherListener* listener, const StatusMask& mask); @@ -158,7 +158,7 @@ class Publisher : public DomainEntity * @param payload_pool IPayloadPool shared pointer that defines writer payload (default: nullptr). * @return Pointer to the created DataWriter. nullptr if failed. */ - RTPS_DllAPI DataWriter* create_datawriter( + FASTDDS_EXPORTED_API DataWriter* create_datawriter( Topic* topic, const DataWriterQos& qos, DataWriterListener* listener = nullptr, @@ -175,7 +175,7 @@ class Publisher : public DomainEntity * @param payload_pool IPayloadPool shared pointer that defines writer payload (default: nullptr). * @return Pointer to the created DataWriter. nullptr if failed. */ - RTPS_DllAPI DataWriter* create_datawriter_with_profile( + FASTDDS_EXPORTED_API DataWriter* create_datawriter_with_profile( Topic* topic, const std::string& profile_name, DataWriterListener* listener = nullptr, @@ -197,7 +197,7 @@ class Publisher : public DomainEntity * @return RETCODE_PRECONDITION_NOT_MET if it does not belong to this Publisher, RETCODE_OK if it is correctly deleted and * RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t delete_datawriter( + FASTDDS_EXPORTED_API ReturnCode_t delete_datawriter( const DataWriter* writer); /** @@ -210,7 +210,7 @@ class Publisher : public DomainEntity * @param topic_name Name of the Topic * @return Pointer to a previously created DataWriter associated to a Topic with the requested topic_name */ - RTPS_DllAPI DataWriter* lookup_datawriter( + FASTDDS_EXPORTED_API DataWriter* lookup_datawriter( const std::string& topic_name) const; /** @@ -219,7 +219,7 @@ class Publisher : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t suspend_publications(); + FASTDDS_EXPORTED_API ReturnCode_t suspend_publications(); /** * @brief Indicates to FastDDS that the modifications to the DataWriters are complete. @@ -227,7 +227,7 @@ class Publisher : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t resume_publications(); + FASTDDS_EXPORTED_API ReturnCode_t resume_publications(); /** * @brief Signals the beginning of a set of coherent cache changes using the Datawriters attached to the publisher @@ -235,7 +235,7 @@ class Publisher : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t begin_coherent_changes(); + FASTDDS_EXPORTED_API ReturnCode_t begin_coherent_changes(); /** * @brief Signals the end of a set of coherent cache changes @@ -243,7 +243,7 @@ class Publisher : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t end_coherent_changes(); + FASTDDS_EXPORTED_API ReturnCode_t end_coherent_changes(); /** * This operation blocks the calling thread until either all data written by the reliable DataWriter entities @@ -256,7 +256,7 @@ class Publisher : public DomainEntity * @return RETCODE_TIMEOUT if the function takes more than the maximum blocking time established, RETCODE_OK if the * Publisher receives the acknowledgments and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t wait_for_acknowledgments( + FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( const fastrtps::Duration_t& max_wait); /** @@ -264,14 +264,14 @@ class Publisher : public DomainEntity * * @return Pointer to the DomainParticipant */ - RTPS_DllAPI const DomainParticipant* get_participant() const; + FASTDDS_EXPORTED_API const DomainParticipant* get_participant() const; /** * @brief Deletes all contained DataWriters * * @return RETCODE_OK if successful, an error code otherwise */ - RTPS_DllAPI ReturnCode_t delete_contained_entities(); + FASTDDS_EXPORTED_API ReturnCode_t delete_contained_entities(); /** * This operation sets a default value of the DataWriter QoS policies which will be used for newly created @@ -287,7 +287,7 @@ class Publisher : public DomainEntity * @param qos DataWriterQos to be set * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_datawriter_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_datawriter_qos( const DataWriterQos& qos); /** @@ -300,7 +300,7 @@ class Publisher : public DomainEntity * * @return Current default WriterQos */ - RTPS_DllAPI const DataWriterQos& get_default_datawriter_qos() const; + FASTDDS_EXPORTED_API const DataWriterQos& get_default_datawriter_qos() const; /** * This operation retrieves the default value of the DataWriter QoS, that is, the QoS policies which will be used @@ -313,7 +313,7 @@ class Publisher : public DomainEntity * @param qos Reference to the current default WriterQos. * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_datawriter_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_datawriter_qos( DataWriterQos& qos) const; /** @@ -324,7 +324,7 @@ class Publisher : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t copy_from_topic_qos( + FASTDDS_EXPORTED_API ReturnCode_t copy_from_topic_qos( fastdds::dds::DataWriterQos& writer_qos, const fastdds::dds::TopicQos& topic_qos) const; @@ -335,7 +335,7 @@ class Publisher : public DomainEntity * @param qos DataWriterQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_datawriter_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_datawriter_qos_from_profile( const std::string& profile_name, DataWriterQos& qos) const; @@ -344,7 +344,7 @@ class Publisher : public DomainEntity * * @return InstanceHandle of this Publisher. */ - RTPS_DllAPI const InstanceHandle_t& get_instance_handle() const; + FASTDDS_EXPORTED_API const InstanceHandle_t& get_instance_handle() const; /** * Fills the given vector with all the datawriters of this publisher. @@ -352,7 +352,7 @@ class Publisher : public DomainEntity * @param writers Vector where the DataWriters are returned * @return true */ - RTPS_DllAPI bool get_datawriters( + FASTDDS_EXPORTED_API bool get_datawriters( std::vector& writers) const; /** @@ -360,7 +360,7 @@ class Publisher : public DomainEntity * * @return true if the publisher has one or several DataWriters, false otherwise */ - RTPS_DllAPI bool has_datawriters() const; + FASTDDS_EXPORTED_API bool has_datawriters() const; protected: diff --git a/include/fastdds/dds/publisher/PublisherListener.hpp b/include/fastdds/dds/publisher/PublisherListener.hpp index 31c820b91f7..2a27ae26d57 100644 --- a/include/fastdds/dds/publisher/PublisherListener.hpp +++ b/include/fastdds/dds/publisher/PublisherListener.hpp @@ -42,14 +42,14 @@ class PublisherListener : public DataWriterListener /** * @brief Constructor */ - RTPS_DllAPI PublisherListener() + FASTDDS_EXPORTED_API PublisherListener() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~PublisherListener() + FASTDDS_EXPORTED_API virtual ~PublisherListener() { } diff --git a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp index 02e682575cb..2a9d48139ef 100644 --- a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp +++ b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp @@ -41,14 +41,14 @@ class RTPSReliableWriterQos /** * @brief Constructor */ - RTPS_DllAPI RTPSReliableWriterQos() + FASTDDS_EXPORTED_API RTPSReliableWriterQos() { } /** * @brief Destructor */ - virtual RTPS_DllAPI ~RTPSReliableWriterQos() = default; + virtual FASTDDS_EXPORTED_API ~RTPSReliableWriterQos() = default; bool operator ==( const RTPSReliableWriterQos& b) const @@ -83,14 +83,14 @@ class DataWriterQos /** * @brief Constructor */ - RTPS_DllAPI DataWriterQos(); + FASTDDS_EXPORTED_API DataWriterQos(); /** * @brief Destructor */ - RTPS_DllAPI ~DataWriterQos() = default; + FASTDDS_EXPORTED_API ~DataWriterQos() = default; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const DataWriterQos& b) const { return (this->durability_ == b.durability()) && @@ -118,7 +118,7 @@ class DataWriterQos (this->data_sharing_ == b.data_sharing()); } - RTPS_DllAPI WriterQos get_writerqos( + FASTDDS_EXPORTED_API WriterQos get_writerqos( const PublisherQos& pqos, const TopicQos& tqos) const; @@ -127,7 +127,7 @@ class DataWriterQos * * @return DurabilityQosPolicy reference */ - RTPS_DllAPI DurabilityQosPolicy& durability() + FASTDDS_EXPORTED_API DurabilityQosPolicy& durability() { return durability_; } @@ -137,7 +137,7 @@ class DataWriterQos * * @return DurabilityQosPolicy reference */ - RTPS_DllAPI const DurabilityQosPolicy& durability() const + FASTDDS_EXPORTED_API const DurabilityQosPolicy& durability() const { return durability_; } @@ -147,7 +147,7 @@ class DataWriterQos * * @param durability new value for the DurabilityQosPolicy */ - RTPS_DllAPI void durability( + FASTDDS_EXPORTED_API void durability( const DurabilityQosPolicy& durability) { durability_ = durability; @@ -158,7 +158,7 @@ class DataWriterQos * * @return DurabilityServiceQosPolicy reference */ - RTPS_DllAPI DurabilityServiceQosPolicy& durability_service() + FASTDDS_EXPORTED_API DurabilityServiceQosPolicy& durability_service() { return durability_service_; } @@ -168,7 +168,7 @@ class DataWriterQos * * @return DurabilityServiceQosPolicy reference */ - RTPS_DllAPI const DurabilityServiceQosPolicy& durability_service() const + FASTDDS_EXPORTED_API const DurabilityServiceQosPolicy& durability_service() const { return durability_service_; } @@ -178,7 +178,7 @@ class DataWriterQos * * @param durability_service new value for the DurabilityServiceQosPolicy */ - RTPS_DllAPI void durability_service( + FASTDDS_EXPORTED_API void durability_service( const DurabilityServiceQosPolicy& durability_service) { durability_service_ = durability_service; @@ -189,7 +189,7 @@ class DataWriterQos * * @return DeadlineQosPolicy reference */ - RTPS_DllAPI DeadlineQosPolicy& deadline() + FASTDDS_EXPORTED_API DeadlineQosPolicy& deadline() { return deadline_; } @@ -199,7 +199,7 @@ class DataWriterQos * * @return DeadlineQosPolicy reference */ - RTPS_DllAPI const DeadlineQosPolicy& deadline() const + FASTDDS_EXPORTED_API const DeadlineQosPolicy& deadline() const { return deadline_; } @@ -209,7 +209,7 @@ class DataWriterQos * * @param deadline new value for the DeadlineQosPolicy */ - RTPS_DllAPI void deadline( + FASTDDS_EXPORTED_API void deadline( const DeadlineQosPolicy& deadline) { deadline_ = deadline; @@ -220,7 +220,7 @@ class DataWriterQos * * @return LatencyBudgetQosPolicy reference */ - RTPS_DllAPI LatencyBudgetQosPolicy& latency_budget() + FASTDDS_EXPORTED_API LatencyBudgetQosPolicy& latency_budget() { return latency_budget_; } @@ -230,7 +230,7 @@ class DataWriterQos * * @return LatencyBudgetQosPolicy reference */ - RTPS_DllAPI const LatencyBudgetQosPolicy& latency_budget() const + FASTDDS_EXPORTED_API const LatencyBudgetQosPolicy& latency_budget() const { return latency_budget_; } @@ -240,7 +240,7 @@ class DataWriterQos * * @param latency_budget new value for the LatencyBudgetQosPolicy */ - RTPS_DllAPI void latency_budget( + FASTDDS_EXPORTED_API void latency_budget( const LatencyBudgetQosPolicy& latency_budget) { latency_budget_ = latency_budget; @@ -251,7 +251,7 @@ class DataWriterQos * * @return LivelinessQosPolicy reference */ - RTPS_DllAPI LivelinessQosPolicy& liveliness() + FASTDDS_EXPORTED_API LivelinessQosPolicy& liveliness() { return liveliness_; } @@ -261,7 +261,7 @@ class DataWriterQos * * @return LivelinessQosPolicy reference */ - RTPS_DllAPI const LivelinessQosPolicy& liveliness() const + FASTDDS_EXPORTED_API const LivelinessQosPolicy& liveliness() const { return liveliness_; } @@ -271,7 +271,7 @@ class DataWriterQos * * @param liveliness new value for the LivelinessQosPolicy */ - RTPS_DllAPI void liveliness( + FASTDDS_EXPORTED_API void liveliness( const LivelinessQosPolicy& liveliness) { liveliness_ = liveliness; @@ -282,7 +282,7 @@ class DataWriterQos * * @return ReliabilityQosPolicy reference */ - RTPS_DllAPI ReliabilityQosPolicy& reliability() + FASTDDS_EXPORTED_API ReliabilityQosPolicy& reliability() { return reliability_; } @@ -292,7 +292,7 @@ class DataWriterQos * * @return ReliabilityQosPolicy reference */ - RTPS_DllAPI const ReliabilityQosPolicy& reliability() const + FASTDDS_EXPORTED_API const ReliabilityQosPolicy& reliability() const { return reliability_; } @@ -302,7 +302,7 @@ class DataWriterQos * * @param reliability new value for the ReliabilityQosPolicy */ - RTPS_DllAPI void reliability( + FASTDDS_EXPORTED_API void reliability( const ReliabilityQosPolicy& reliability) { reliability_ = reliability; @@ -313,7 +313,7 @@ class DataWriterQos * * @return DestinationOrderQosPolicy reference */ - RTPS_DllAPI DestinationOrderQosPolicy& destination_order() + FASTDDS_EXPORTED_API DestinationOrderQosPolicy& destination_order() { return destination_order_; } @@ -323,7 +323,7 @@ class DataWriterQos * * @return DestinationOrderQosPolicy reference */ - RTPS_DllAPI const DestinationOrderQosPolicy& destination_order() const + FASTDDS_EXPORTED_API const DestinationOrderQosPolicy& destination_order() const { return destination_order_; } @@ -333,7 +333,7 @@ class DataWriterQos * * @param destination_order new value for the DestinationOrderQosPolicy */ - RTPS_DllAPI void destination_order( + FASTDDS_EXPORTED_API void destination_order( const DestinationOrderQosPolicy& destination_order) { destination_order_ = destination_order; @@ -344,7 +344,7 @@ class DataWriterQos * * @return HistoryQosPolicy reference */ - RTPS_DllAPI HistoryQosPolicy& history() + FASTDDS_EXPORTED_API HistoryQosPolicy& history() { return history_; } @@ -354,7 +354,7 @@ class DataWriterQos * * @return HistoryQosPolicy reference */ - RTPS_DllAPI const HistoryQosPolicy& history() const + FASTDDS_EXPORTED_API const HistoryQosPolicy& history() const { return history_; } @@ -364,7 +364,7 @@ class DataWriterQos * * @param history new value for the HistoryQosPolicy */ - RTPS_DllAPI void history( + FASTDDS_EXPORTED_API void history( const HistoryQosPolicy& history) { history_ = history; @@ -375,7 +375,7 @@ class DataWriterQos * * @return ResourceLimitsQosPolicy reference */ - RTPS_DllAPI ResourceLimitsQosPolicy& resource_limits() + FASTDDS_EXPORTED_API ResourceLimitsQosPolicy& resource_limits() { return resource_limits_; } @@ -385,7 +385,7 @@ class DataWriterQos * * @return ResourceLimitsQosPolicy reference */ - RTPS_DllAPI const ResourceLimitsQosPolicy& resource_limits() const + FASTDDS_EXPORTED_API const ResourceLimitsQosPolicy& resource_limits() const { return resource_limits_; } @@ -395,7 +395,7 @@ class DataWriterQos * * @param resource_limits new value for the ResourceLimitsQosPolicy */ - RTPS_DllAPI void resource_limits( + FASTDDS_EXPORTED_API void resource_limits( const ResourceLimitsQosPolicy& resource_limits) { resource_limits_ = resource_limits; @@ -406,7 +406,7 @@ class DataWriterQos * * @return TransportPriorityQosPolicy reference */ - RTPS_DllAPI TransportPriorityQosPolicy& transport_priority() + FASTDDS_EXPORTED_API TransportPriorityQosPolicy& transport_priority() { return transport_priority_; } @@ -416,7 +416,7 @@ class DataWriterQos * * @return TransportPriorityQosPolicy reference */ - RTPS_DllAPI const TransportPriorityQosPolicy& transport_priority() const + FASTDDS_EXPORTED_API const TransportPriorityQosPolicy& transport_priority() const { return transport_priority_; } @@ -426,7 +426,7 @@ class DataWriterQos * * @param transport_priority new value for the TransportPriorityQosPolicy */ - RTPS_DllAPI void transport_priority( + FASTDDS_EXPORTED_API void transport_priority( const TransportPriorityQosPolicy& transport_priority) { transport_priority_ = transport_priority; @@ -437,7 +437,7 @@ class DataWriterQos * * @return LifespanQosPolicy reference */ - RTPS_DllAPI LifespanQosPolicy& lifespan() + FASTDDS_EXPORTED_API LifespanQosPolicy& lifespan() { return lifespan_; } @@ -447,7 +447,7 @@ class DataWriterQos * * @return LifespanQosPolicy reference */ - RTPS_DllAPI const LifespanQosPolicy& lifespan() const + FASTDDS_EXPORTED_API const LifespanQosPolicy& lifespan() const { return lifespan_; } @@ -457,7 +457,7 @@ class DataWriterQos * * @param lifespan new value for the LifespanQosPolicy */ - RTPS_DllAPI void lifespan( + FASTDDS_EXPORTED_API void lifespan( const LifespanQosPolicy& lifespan) { lifespan_ = lifespan; @@ -468,7 +468,7 @@ class DataWriterQos * * @return UserDataQosPolicy reference */ - RTPS_DllAPI UserDataQosPolicy& user_data() + FASTDDS_EXPORTED_API UserDataQosPolicy& user_data() { return user_data_; } @@ -478,7 +478,7 @@ class DataWriterQos * * @return UserDataQosPolicy reference */ - RTPS_DllAPI const UserDataQosPolicy& user_data() const + FASTDDS_EXPORTED_API const UserDataQosPolicy& user_data() const { return user_data_; } @@ -488,7 +488,7 @@ class DataWriterQos * * @param user_data new value for the UserDataQosPolicy */ - RTPS_DllAPI void user_data( + FASTDDS_EXPORTED_API void user_data( const UserDataQosPolicy& user_data) { user_data_ = user_data; @@ -499,7 +499,7 @@ class DataWriterQos * * @return OwnershipQosPolicy reference */ - RTPS_DllAPI OwnershipQosPolicy& ownership() + FASTDDS_EXPORTED_API OwnershipQosPolicy& ownership() { return ownership_; } @@ -509,7 +509,7 @@ class DataWriterQos * * @return OwnershipQosPolicy reference */ - RTPS_DllAPI const OwnershipQosPolicy& ownership() const + FASTDDS_EXPORTED_API const OwnershipQosPolicy& ownership() const { return ownership_; } @@ -519,7 +519,7 @@ class DataWriterQos * * @param ownership new value for the OwnershipQosPolicy */ - RTPS_DllAPI void ownership( + FASTDDS_EXPORTED_API void ownership( const OwnershipQosPolicy& ownership) { ownership_ = ownership; @@ -530,7 +530,7 @@ class DataWriterQos * * @return OwnershipStrengthQosPolicy reference */ - RTPS_DllAPI OwnershipStrengthQosPolicy& ownership_strength() + FASTDDS_EXPORTED_API OwnershipStrengthQosPolicy& ownership_strength() { return ownership_strength_; } @@ -540,7 +540,7 @@ class DataWriterQos * * @return OwnershipStrengthQosPolicy reference */ - RTPS_DllAPI const OwnershipStrengthQosPolicy& ownership_strength() const + FASTDDS_EXPORTED_API const OwnershipStrengthQosPolicy& ownership_strength() const { return ownership_strength_; } @@ -550,7 +550,7 @@ class DataWriterQos * * @param ownership_strength new value for the OwnershipStrengthQosPolicy */ - RTPS_DllAPI void ownership_strength( + FASTDDS_EXPORTED_API void ownership_strength( const OwnershipStrengthQosPolicy& ownership_strength) { ownership_strength_ = ownership_strength; @@ -561,7 +561,7 @@ class DataWriterQos * * @return WriterDataLifecycleQosPolicy reference */ - RTPS_DllAPI WriterDataLifecycleQosPolicy& writer_data_lifecycle() + FASTDDS_EXPORTED_API WriterDataLifecycleQosPolicy& writer_data_lifecycle() { return writer_data_lifecycle_; } @@ -571,7 +571,7 @@ class DataWriterQos * * @return WriterDataLifecycleQosPolicy reference */ - RTPS_DllAPI const WriterDataLifecycleQosPolicy& writer_data_lifecycle() const + FASTDDS_EXPORTED_API const WriterDataLifecycleQosPolicy& writer_data_lifecycle() const { return writer_data_lifecycle_; } @@ -581,7 +581,7 @@ class DataWriterQos * * @param writer_data_lifecycle new value for the WriterDataLifecycleQosPolicy */ - RTPS_DllAPI void writer_data_lifecycle( + FASTDDS_EXPORTED_API void writer_data_lifecycle( const WriterDataLifecycleQosPolicy& writer_data_lifecycle) { writer_data_lifecycle_ = writer_data_lifecycle; @@ -592,7 +592,7 @@ class DataWriterQos * * @return PublishModeQosPolicy reference */ - RTPS_DllAPI PublishModeQosPolicy& publish_mode() + FASTDDS_EXPORTED_API PublishModeQosPolicy& publish_mode() { return publish_mode_; } @@ -602,7 +602,7 @@ class DataWriterQos * * @return PublishModeQosPolicy reference */ - RTPS_DllAPI const PublishModeQosPolicy& publish_mode() const + FASTDDS_EXPORTED_API const PublishModeQosPolicy& publish_mode() const { return publish_mode_; } @@ -612,7 +612,7 @@ class DataWriterQos * * @param publish_mode new value for the PublishModeQosPolicy */ - RTPS_DllAPI void publish_mode( + FASTDDS_EXPORTED_API void publish_mode( const PublishModeQosPolicy& publish_mode) { publish_mode_ = publish_mode; @@ -623,7 +623,7 @@ class DataWriterQos * * @return DataRepresentationQosPolicy reference */ - RTPS_DllAPI DataRepresentationQosPolicy& representation() + FASTDDS_EXPORTED_API DataRepresentationQosPolicy& representation() { return representation_; } @@ -633,7 +633,7 @@ class DataWriterQos * * @return DataRepresentationQosPolicy reference */ - RTPS_DllAPI const DataRepresentationQosPolicy& representation() const + FASTDDS_EXPORTED_API const DataRepresentationQosPolicy& representation() const { return representation_; } @@ -643,7 +643,7 @@ class DataWriterQos * * @param representation new value for the DataRepresentationQosPolicy */ - RTPS_DllAPI void representation( + FASTDDS_EXPORTED_API void representation( const DataRepresentationQosPolicy& representation) { representation_ = representation; @@ -654,7 +654,7 @@ class DataWriterQos * * @return PropertyPolicyQos reference */ - RTPS_DllAPI PropertyPolicyQos& properties() + FASTDDS_EXPORTED_API PropertyPolicyQos& properties() { return properties_; } @@ -664,7 +664,7 @@ class DataWriterQos * * @return PropertyPolicyQos reference */ - RTPS_DllAPI const PropertyPolicyQos& properties() const + FASTDDS_EXPORTED_API const PropertyPolicyQos& properties() const { return properties_; } @@ -674,7 +674,7 @@ class DataWriterQos * * @param properties new value for the PropertyPolicyQos */ - RTPS_DllAPI void properties( + FASTDDS_EXPORTED_API void properties( const PropertyPolicyQos& properties) { properties_ = properties; @@ -685,7 +685,7 @@ class DataWriterQos * * @return RTPSReliableWriterQos reference */ - RTPS_DllAPI RTPSReliableWriterQos& reliable_writer_qos() + FASTDDS_EXPORTED_API RTPSReliableWriterQos& reliable_writer_qos() { return reliable_writer_qos_; } @@ -695,7 +695,7 @@ class DataWriterQos * * @return RTPSReliableWriterQos reference */ - RTPS_DllAPI const RTPSReliableWriterQos& reliable_writer_qos() const + FASTDDS_EXPORTED_API const RTPSReliableWriterQos& reliable_writer_qos() const { return reliable_writer_qos_; } @@ -705,7 +705,7 @@ class DataWriterQos * * @param reliable_writer_qos new value for the RTPSReliableWriterQos */ - RTPS_DllAPI void reliable_writer_qos( + FASTDDS_EXPORTED_API void reliable_writer_qos( const RTPSReliableWriterQos& reliable_writer_qos) { reliable_writer_qos_ = reliable_writer_qos; @@ -716,7 +716,7 @@ class DataWriterQos * * @return RTPSEndpointQos reference */ - RTPS_DllAPI RTPSEndpointQos& endpoint() + FASTDDS_EXPORTED_API RTPSEndpointQos& endpoint() { return endpoint_; } @@ -725,7 +725,7 @@ class DataWriterQos * Getter for RTPSEndpointQos * @return RTPSEndpointQos reference */ - RTPS_DllAPI const RTPSEndpointQos& endpoint() const + FASTDDS_EXPORTED_API const RTPSEndpointQos& endpoint() const { return endpoint_; } @@ -735,7 +735,7 @@ class DataWriterQos * * @param endpoint new value for the RTPSEndpointQos */ - RTPS_DllAPI void endpoint( + FASTDDS_EXPORTED_API void endpoint( const RTPSEndpointQos& endpoint) { endpoint_ = endpoint; @@ -746,7 +746,7 @@ class DataWriterQos * * @return WriterResourceLimitsQos reference */ - RTPS_DllAPI WriterResourceLimitsQos& writer_resource_limits() + FASTDDS_EXPORTED_API WriterResourceLimitsQos& writer_resource_limits() { return writer_resource_limits_; } @@ -756,7 +756,7 @@ class DataWriterQos * * @return WriterResourceLimitsQos reference */ - RTPS_DllAPI const WriterResourceLimitsQos& writer_resource_limits() const + FASTDDS_EXPORTED_API const WriterResourceLimitsQos& writer_resource_limits() const { return writer_resource_limits_; } @@ -766,7 +766,7 @@ class DataWriterQos * * @param writer_resource_limits new value for the WriterResourceLimitsQos */ - RTPS_DllAPI void writer_resource_limits( + FASTDDS_EXPORTED_API void writer_resource_limits( const WriterResourceLimitsQos& writer_resource_limits) { writer_resource_limits_ = writer_resource_limits; @@ -778,7 +778,7 @@ class DataWriterQos * @return ThroughputControllerDescriptor reference * @deprecated Use flow_controllers() on DomainParticipantQoS */ - RTPS_DllAPI fastrtps::rtps::ThroughputControllerDescriptor& throughput_controller() + FASTDDS_EXPORTED_API fastrtps::rtps::ThroughputControllerDescriptor& throughput_controller() { return throughput_controller_; } @@ -789,7 +789,7 @@ class DataWriterQos * @return ThroughputControllerDescriptor reference * @deprecated Use flow_controllers() on DomainParticipantQoS */ - RTPS_DllAPI const fastrtps::rtps::ThroughputControllerDescriptor& throughput_controller() const + FASTDDS_EXPORTED_API const fastrtps::rtps::ThroughputControllerDescriptor& throughput_controller() const { return throughput_controller_; } @@ -800,7 +800,7 @@ class DataWriterQos * @param throughput_controller new value for the ThroughputControllerDescriptor * @deprecated Use flow_controllers() on DomainParticipantQoS */ - RTPS_DllAPI void throughput_controller( + FASTDDS_EXPORTED_API void throughput_controller( const fastrtps::rtps::ThroughputControllerDescriptor& throughput_controller) { throughput_controller_ = throughput_controller; @@ -811,7 +811,7 @@ class DataWriterQos * * @return DataSharingQosPolicy reference */ - RTPS_DllAPI DataSharingQosPolicy& data_sharing() + FASTDDS_EXPORTED_API DataSharingQosPolicy& data_sharing() { return data_sharing_; } @@ -821,7 +821,7 @@ class DataWriterQos * * @return DataSharingQosPolicy reference */ - RTPS_DllAPI const DataSharingQosPolicy& data_sharing() const + FASTDDS_EXPORTED_API const DataSharingQosPolicy& data_sharing() const { return data_sharing_; } @@ -831,7 +831,7 @@ class DataWriterQos * * @param data_sharing new value for the DataSharingQosPolicy */ - RTPS_DllAPI void data_sharing( + FASTDDS_EXPORTED_API void data_sharing( const DataSharingQosPolicy& data_sharing) { data_sharing_ = data_sharing; @@ -909,7 +909,7 @@ class DataWriterQos DataSharingQosPolicy data_sharing_; }; -RTPS_DllAPI extern const DataWriterQos DATAWRITER_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const DataWriterQos DATAWRITER_QOS_DEFAULT; } // namespace dds } // namespace fastdds diff --git a/include/fastdds/dds/publisher/qos/PublisherQos.hpp b/include/fastdds/dds/publisher/qos/PublisherQos.hpp index 99adc03e83f..42e12a8e0ad 100644 --- a/include/fastdds/dds/publisher/qos/PublisherQos.hpp +++ b/include/fastdds/dds/publisher/qos/PublisherQos.hpp @@ -42,14 +42,14 @@ class PublisherQos /** * @brief Constructor */ - RTPS_DllAPI PublisherQos() + FASTDDS_EXPORTED_API PublisherQos() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~PublisherQos() = default; + FASTDDS_EXPORTED_API virtual ~PublisherQos() = default; bool operator ==( const PublisherQos& b) const @@ -200,7 +200,7 @@ class PublisherQos }; -RTPS_DllAPI extern const PublisherQos PUBLISHER_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const PublisherQos PUBLISHER_QOS_DEFAULT; } // namespace dds } // namespace fastdds diff --git a/include/fastdds/dds/publisher/qos/WriterQos.hpp b/include/fastdds/dds/publisher/qos/WriterQos.hpp index d8ec2be70a2..337f44769ea 100644 --- a/include/fastdds/dds/publisher/qos/WriterQos.hpp +++ b/include/fastdds/dds/publisher/qos/WriterQos.hpp @@ -37,8 +37,8 @@ class WriterQos { public: - RTPS_DllAPI WriterQos(); - RTPS_DllAPI virtual ~WriterQos(); + FASTDDS_EXPORTED_API WriterQos(); + FASTDDS_EXPORTED_API virtual ~WriterQos(); bool operator ==( const WriterQos& b) const @@ -133,7 +133,7 @@ class WriterQos * @param qos Reference from a WriterQos object. * @param first_time Boolean indicating whether is the first time (If not some parameters cannot be set). */ - RTPS_DllAPI void setQos( + FASTDDS_EXPORTED_API void setQos( const WriterQos& qos, bool first_time); @@ -141,15 +141,15 @@ class WriterQos * Check if the Qos values are compatible between each other. * @return True if correct. */ - RTPS_DllAPI bool checkQos() const; + FASTDDS_EXPORTED_API bool checkQos() const; - RTPS_DllAPI bool canQosBeUpdated( + FASTDDS_EXPORTED_API bool canQosBeUpdated( const WriterQos& qos) const; void clear(); }; -//RTPS_DllAPI extern const WriterQos DATAWRITER_QOS_DEFAULT; +//FASTDDS_EXPORTED_API extern const WriterQos DATAWRITER_QOS_DEFAULT; } //namespace dds } //namespace fastdds diff --git a/include/fastdds/dds/subscriber/DataReader.hpp b/include/fastdds/dds/subscriber/DataReader.hpp index ad7eaee01ae..af721648b78 100644 --- a/include/fastdds/dds/subscriber/DataReader.hpp +++ b/include/fastdds/dds/subscriber/DataReader.hpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -117,7 +117,7 @@ class DataReader : public DomainEntity * @return RETCODE_OK is successfully enabled. RETCODE_PRECONDITION_NOT_MET if the Subscriber creating this * DataReader is not enabled. */ - RTPS_DllAPI ReturnCode_t enable() override; + FASTDDS_EXPORTED_API ReturnCode_t enable() override; /** * Method to block the current thread until an unread message is available. @@ -126,7 +126,7 @@ class DataReader : public DomainEntity * * @return true if there is new unread message, false if timeout */ - RTPS_DllAPI bool wait_for_unread_message( + FASTDDS_EXPORTED_API bool wait_for_unread_message( const fastrtps::Duration_t& timeout); /** @@ -138,7 +138,7 @@ class DataReader : public DomainEntity * @return RETCODE_OK if there is new unread message, ReturnCode_t::RETCODE_TIMEOUT if timeout * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t wait_for_historical_data( + FASTDDS_EXPORTED_API ReturnCode_t wait_for_historical_data( const fastrtps::Duration_t& max_wait) const; @@ -305,7 +305,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read( + FASTDDS_EXPORTED_API ReturnCode_t read( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -336,7 +336,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read_w_condition( + FASTDDS_EXPORTED_API ReturnCode_t read_w_condition( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples, @@ -376,7 +376,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read_instance( + FASTDDS_EXPORTED_API ReturnCode_t read_instance( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -441,7 +441,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read_next_instance( + FASTDDS_EXPORTED_API ReturnCode_t read_next_instance( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -479,7 +479,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read_next_instance_w_condition( + FASTDDS_EXPORTED_API ReturnCode_t read_next_instance_w_condition( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples, @@ -505,7 +505,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t read_next_sample( + FASTDDS_EXPORTED_API ReturnCode_t read_next_sample( void* data, SampleInfo* info); @@ -540,7 +540,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take( + FASTDDS_EXPORTED_API ReturnCode_t take( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -569,7 +569,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take_w_condition( + FASTDDS_EXPORTED_API ReturnCode_t take_w_condition( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples, @@ -603,7 +603,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take_instance( + FASTDDS_EXPORTED_API ReturnCode_t take_instance( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -642,7 +642,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take_next_instance( + FASTDDS_EXPORTED_API ReturnCode_t take_next_instance( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples = LENGTH_UNLIMITED, @@ -679,7 +679,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take_next_instance_w_condition( + FASTDDS_EXPORTED_API ReturnCode_t take_next_instance_w_condition( LoanableCollection& data_values, SampleInfoSeq& sample_infos, int32_t max_samples, @@ -707,7 +707,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t take_next_sample( + FASTDDS_EXPORTED_API ReturnCode_t take_next_sample( void* data, SampleInfo* info); @@ -746,7 +746,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t return_loan( + FASTDDS_EXPORTED_API ReturnCode_t return_loan( LoanableCollection& data_values, SampleInfoSeq& sample_infos); @@ -766,7 +766,7 @@ class DataReader : public DomainEntity * @return Any of the standard return codes. * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_key_value( + FASTDDS_EXPORTED_API ReturnCode_t get_key_value( void* key_holder, const InstanceHandle_t& handle); @@ -781,7 +781,7 @@ class DataReader : public DomainEntity * @return HANDLE_NIL if @c instance is nullptr. * @return HANDLE_NIL if there is no instance on the DataReader's history with the same key as @c instance. */ - RTPS_DllAPI InstanceHandle_t lookup_instance( + FASTDDS_EXPORTED_API InstanceHandle_t lookup_instance( const void* instance) const; /** @@ -791,7 +791,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK if sample info was returned. RETCODE_NO_DATA if there is no sample to take. */ - RTPS_DllAPI ReturnCode_t get_first_untaken_info( + FASTDDS_EXPORTED_API ReturnCode_t get_first_untaken_info( SampleInfo* info); /** @@ -801,7 +801,7 @@ class DataReader : public DomainEntity * * @return the number of samples on the reader history that have never been read. */ - RTPS_DllAPI uint64_t get_unread_count() const; + FASTDDS_EXPORTED_API uint64_t get_unread_count() const; /** * Get the number of samples pending to be read. @@ -810,7 +810,7 @@ class DataReader : public DomainEntity * * @return the number of samples on the reader history that have never been read. */ - RTPS_DllAPI uint64_t get_unread_count( + FASTDDS_EXPORTED_API uint64_t get_unread_count( bool mark_as_read) const; /** @@ -818,42 +818,42 @@ class DataReader : public DomainEntity * * @return Associated GUID */ - RTPS_DllAPI const fastrtps::rtps::GUID_t& guid(); + FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid(); /** * Get associated GUID. * * @return Associated GUID */ - RTPS_DllAPI const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; /** * @brief Getter for the associated InstanceHandle. * * @return Copy of the InstanceHandle */ - RTPS_DllAPI InstanceHandle_t get_instance_handle() const; + FASTDDS_EXPORTED_API InstanceHandle_t get_instance_handle() const; /** * Getter for the data type. * * @return TypeSupport associated to the DataReader. */ - RTPS_DllAPI TypeSupport type(); + FASTDDS_EXPORTED_API TypeSupport type(); /** * Get TopicDescription. * * @return TopicDescription pointer. */ - RTPS_DllAPI const TopicDescription* get_topicdescription() const; + FASTDDS_EXPORTED_API const TopicDescription* get_topicdescription() const; /** * @brief Get the requested deadline missed status. * * @return The deadline missed status. */ - RTPS_DllAPI ReturnCode_t get_requested_deadline_missed_status( + FASTDDS_EXPORTED_API ReturnCode_t get_requested_deadline_missed_status( RequestedDeadlineMissedStatus& status); /** @@ -863,7 +863,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_requested_incompatible_qos_status( + FASTDDS_EXPORTED_API ReturnCode_t get_requested_incompatible_qos_status( RequestedIncompatibleQosStatus& status); /** @@ -874,7 +874,7 @@ class DataReader : public DomainEntity * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is * not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const DataReaderQos& qos); /** @@ -882,7 +882,7 @@ class DataReader : public DomainEntity * * @return Pointer to the DataReaderQos. */ - RTPS_DllAPI const DataReaderQos& get_qos() const; + FASTDDS_EXPORTED_API const DataReaderQos& get_qos() const; /** * @brief Getter for the DataReaderQos. @@ -891,7 +891,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( DataReaderQos& qos) const; /** @@ -901,7 +901,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DataReaderListener* listener); /** @@ -912,7 +912,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( DataReaderListener* listener, const StatusMask& mask); /** @@ -920,10 +920,10 @@ class DataReader : public DomainEntity * * @return Pointer to the DataReaderListener */ - RTPS_DllAPI const DataReaderListener* get_listener() const; + FASTDDS_EXPORTED_API const DataReaderListener* get_listener() const; /* TODO - RTPS_DllAPI bool get_key_value( + FASTDDS_EXPORTED_API bool get_key_value( void* data, const InstanceHandle_t& handle); */ @@ -935,7 +935,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_liveliness_changed_status( + FASTDDS_EXPORTED_API ReturnCode_t get_liveliness_changed_status( LivelinessChangedStatus& status) const; @@ -946,7 +946,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_sample_lost_status( + FASTDDS_EXPORTED_API ReturnCode_t get_sample_lost_status( SampleLostStatus& status) const; /** @@ -956,7 +956,7 @@ class DataReader : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_sample_rejected_status( + FASTDDS_EXPORTED_API ReturnCode_t get_sample_rejected_status( SampleRejectedStatus& status) const; /** @@ -965,7 +965,7 @@ class DataReader : public DomainEntity * @param[out] status subscription matched status struct * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_subscription_matched_status( + FASTDDS_EXPORTED_API ReturnCode_t get_subscription_matched_status( SubscriptionMatchedStatus& status) const; /** @@ -976,7 +976,7 @@ class DataReader : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_matched_publication_data( + FASTDDS_EXPORTED_API ReturnCode_t get_matched_publication_data( builtin::PublicationBuiltinTopicData& publication_data, const fastrtps::rtps::InstanceHandle_t& publication_handle) const; @@ -987,7 +987,7 @@ class DataReader : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_matched_publications( + FASTDDS_EXPORTED_API ReturnCode_t get_matched_publications( std::vector& publication_handles) const; /** @@ -1000,7 +1000,7 @@ class DataReader : public DomainEntity * * @return pointer to the created ReadCondition, nullptr in case of error. */ - RTPS_DllAPI ReadCondition* create_readcondition( + FASTDDS_EXPORTED_API ReadCondition* create_readcondition( SampleStateMask sample_states, ViewStateMask view_states, InstanceStateMask instance_states); @@ -1017,7 +1017,7 @@ class DataReader : public DomainEntity * * @return pointer to the created QueryCondition, nullptr in case of error. */ - RTPS_DllAPI QueryCondition* create_querycondition( + FASTDDS_EXPORTED_API QueryCondition* create_querycondition( SampleStateMask sample_states, ViewStateMask view_states, InstanceStateMask instance_states, @@ -1030,14 +1030,14 @@ class DataReader : public DomainEntity * @param a_condition pointer to a ReadCondition belonging to the DataReader * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t delete_readcondition( + FASTDDS_EXPORTED_API ReturnCode_t delete_readcondition( ReadCondition* a_condition); /** * @brief Getter for the Subscriber * @return Subscriber pointer */ - RTPS_DllAPI const Subscriber* get_subscriber() const; + FASTDDS_EXPORTED_API const Subscriber* get_subscriber() const; /** * This operation deletes all the entities that were created by means of the “create” operations on the DataReader. @@ -1048,7 +1048,7 @@ class DataReader : public DomainEntity * * @return Any of the standard return codes. */ - RTPS_DllAPI ReturnCode_t delete_contained_entities(); + FASTDDS_EXPORTED_API ReturnCode_t delete_contained_entities(); /** * Checks whether a loaned sample is still valid or is corrupted. @@ -1060,7 +1060,7 @@ class DataReader : public DomainEntity * * @return true if the sample is valid */ - RTPS_DllAPI bool is_sample_valid( + FASTDDS_EXPORTED_API bool is_sample_valid( const void* data, const SampleInfo* info) const; @@ -1072,7 +1072,7 @@ class DataReader : public DomainEntity * @return NOT_ENABLED if the reader has not been enabled. * @return OK if a list of locators is returned. */ - RTPS_DllAPI ReturnCode_t get_listening_locators( + FASTDDS_EXPORTED_API ReturnCode_t get_listening_locators( rtps::LocatorList& locators) const; protected: diff --git a/include/fastdds/dds/subscriber/DataReaderListener.hpp b/include/fastdds/dds/subscriber/DataReaderListener.hpp index b0c8f0c45ed..aad9d3c3574 100644 --- a/include/fastdds/dds/subscriber/DataReaderListener.hpp +++ b/include/fastdds/dds/subscriber/DataReaderListener.hpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -44,14 +44,14 @@ class DataReaderListener /** * @brief Constructor */ - RTPS_DllAPI DataReaderListener() + FASTDDS_EXPORTED_API DataReaderListener() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~DataReaderListener() + FASTDDS_EXPORTED_API virtual ~DataReaderListener() { } @@ -60,7 +60,7 @@ class DataReaderListener * * @param reader DataReader */ - RTPS_DllAPI virtual void on_data_available( + FASTDDS_EXPORTED_API virtual void on_data_available( DataReader* reader) { (void)reader; @@ -72,7 +72,7 @@ class DataReaderListener * @param reader DataReader * @param info The subscription matched status */ - RTPS_DllAPI virtual void on_subscription_matched( + FASTDDS_EXPORTED_API virtual void on_subscription_matched( DataReader* reader, const fastdds::dds::SubscriptionMatchedStatus& info) { @@ -86,7 +86,7 @@ class DataReaderListener * @param reader DataReader * @param status The requested deadline missed status */ - RTPS_DllAPI virtual void on_requested_deadline_missed( + FASTDDS_EXPORTED_API virtual void on_requested_deadline_missed( DataReader* reader, const RequestedDeadlineMissedStatus& status) { @@ -100,7 +100,7 @@ class DataReaderListener * @param reader The DataReader * @param status The liveliness changed status */ - RTPS_DllAPI virtual void on_liveliness_changed( + FASTDDS_EXPORTED_API virtual void on_liveliness_changed( DataReader* reader, const LivelinessChangedStatus& status) { @@ -114,7 +114,7 @@ class DataReaderListener * @param reader The DataReader * @param status The rejected status */ - RTPS_DllAPI virtual void on_sample_rejected( + FASTDDS_EXPORTED_API virtual void on_sample_rejected( DataReader* reader, const SampleRejectedStatus& status) { @@ -128,7 +128,7 @@ class DataReaderListener * @param reader The DataReader * @param status The requested incompatible QoS status */ - RTPS_DllAPI virtual void on_requested_incompatible_qos( + FASTDDS_EXPORTED_API virtual void on_requested_incompatible_qos( DataReader* reader, const RequestedIncompatibleQosStatus& status) { @@ -142,7 +142,7 @@ class DataReaderListener * @param reader The DataReader * @param status The sample lost status */ - RTPS_DllAPI virtual void on_sample_lost( + FASTDDS_EXPORTED_API virtual void on_sample_lost( DataReader* reader, const SampleLostStatus& status) { diff --git a/include/fastdds/dds/subscriber/ReadCondition.hpp b/include/fastdds/dds/subscriber/ReadCondition.hpp index b4d530efdc9..7e79732b308 100644 --- a/include/fastdds/dds/subscriber/ReadCondition.hpp +++ b/include/fastdds/dds/subscriber/ReadCondition.hpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -74,7 +74,7 @@ class ReadCondition : public Condition * @brief Retrieves the trigger_value of the Condition * @return true if trigger_value is set to 'true', 'false' otherwise */ - RTPS_DllAPI bool get_trigger_value() const noexcept override; + FASTDDS_EXPORTED_API bool get_trigger_value() const noexcept override; /** * @brief Retrieves the DataReader associated with the ReadCondition. @@ -83,28 +83,28 @@ class ReadCondition : public Condition * * @return pointer to the DataReader associated with this ReadCondition. */ - RTPS_DllAPI DataReader* get_datareader() const noexcept; + FASTDDS_EXPORTED_API DataReader* get_datareader() const noexcept; /** * @brief Retrieves the set of sample_states taken into account to determine the trigger_value of this condition. * * @return the sample_states specified when the ReadCondition was created. */ - RTPS_DllAPI SampleStateMask get_sample_state_mask() const noexcept; + FASTDDS_EXPORTED_API SampleStateMask get_sample_state_mask() const noexcept; /** * @brief Retrieves the set of view_states taken into account to determine the trigger_value of this condition. * * @return the view_states specified when the ReadCondition was created. */ - RTPS_DllAPI ViewStateMask get_view_state_mask() const noexcept; + FASTDDS_EXPORTED_API ViewStateMask get_view_state_mask() const noexcept; /** * @brief Retrieves the set of instance_states taken into account to determine the trigger_value of this condition. * * @return the instance_states specified when the ReadCondition was created. */ - RTPS_DllAPI InstanceStateMask get_instance_state_mask() const noexcept; + FASTDDS_EXPORTED_API InstanceStateMask get_instance_state_mask() const noexcept; detail::ReadConditionImpl* get_impl() const noexcept { diff --git a/include/fastdds/dds/subscriber/Subscriber.hpp b/include/fastdds/dds/subscriber/Subscriber.hpp index 5cb5e21e55e..2358d6ed66f 100644 --- a/include/fastdds/dds/subscriber/Subscriber.hpp +++ b/include/fastdds/dds/subscriber/Subscriber.hpp @@ -100,14 +100,14 @@ class Subscriber : public DomainEntity * @return RETCODE_OK is successfully enabled. RETCODE_PRECONDITION_NOT_MET if the participant creating this * Subscriber is not enabled. */ - RTPS_DllAPI ReturnCode_t enable() override; + FASTDDS_EXPORTED_API ReturnCode_t enable() override; /** * Allows accessing the Subscriber Qos. * * @return SubscriberQos reference */ - RTPS_DllAPI const SubscriberQos& get_qos() const; + FASTDDS_EXPORTED_API const SubscriberQos& get_qos() const; /** * Retrieves the Subscriber Qos. @@ -115,7 +115,7 @@ class Subscriber : public DomainEntity * @param qos SubscriberQos where the qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( SubscriberQos& qos) const; /** @@ -126,7 +126,7 @@ class Subscriber : public DomainEntity * @return RETCODE_IMMUTABLE_POLICY if any of the Qos cannot be changed, RETCODE_INCONSISTENT_POLICY if the Qos is not * self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const SubscriberQos& qos); /** @@ -134,7 +134,7 @@ class Subscriber : public DomainEntity * * @return Pointer to the SubscriberListener */ - RTPS_DllAPI const SubscriberListener* get_listener() const; + FASTDDS_EXPORTED_API const SubscriberListener* get_listener() const; /** * Modifies the SubscriberListener, sets the mask to StatusMask::all() @@ -142,7 +142,7 @@ class Subscriber : public DomainEntity * @param listener new value for SubscriberListener * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( SubscriberListener* listener); /** @@ -152,7 +152,7 @@ class Subscriber : public DomainEntity * @param mask StatusMask that holds statuses the listener responds to. * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( SubscriberListener* listener, const StatusMask& mask); /** @@ -165,7 +165,7 @@ class Subscriber : public DomainEntity * @param payload_pool IPayloadPool shared pointer that defines reader payload (default: nullptr). * @return Pointer to the created DataReader. nullptr if failed. */ - RTPS_DllAPI DataReader* create_datareader( + FASTDDS_EXPORTED_API DataReader* create_datareader( TopicDescription* topic, const DataReaderQos& reader_qos, DataReaderListener* listener = nullptr, @@ -182,7 +182,7 @@ class Subscriber : public DomainEntity * @param payload_pool IPayloadPool shared pointer that defines reader payload (default: nullptr). * @return Pointer to the created DataReader. nullptr if failed. */ - RTPS_DllAPI DataReader* create_datareader_with_profile( + FASTDDS_EXPORTED_API DataReader* create_datareader_with_profile( TopicDescription* topic, const std::string& profile_name, DataReaderListener* listener = nullptr, @@ -200,7 +200,7 @@ class Subscriber : public DomainEntity * @return RETCODE_PRECONDITION_NOT_MET if the datareader does not belong to this subscriber, RETCODE_OK if it is correctly * deleted and RETCODE_ERROR otherwise. */ - RTPS_DllAPI ReturnCode_t delete_datareader( + FASTDDS_EXPORTED_API ReturnCode_t delete_datareader( const DataReader* reader); /** @@ -213,7 +213,7 @@ class Subscriber : public DomainEntity * @param topic_name Name of the topic associated to the DataReader * @return Pointer to a previously created DataReader created on a Topic with that topic_name */ - RTPS_DllAPI DataReader* lookup_datareader( + FASTDDS_EXPORTED_API DataReader* lookup_datareader( const std::string& topic_name) const; /** @@ -222,7 +222,7 @@ class Subscriber : public DomainEntity * @param readers Vector of DataReader where the list of existing readers is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_datareaders( + FASTDDS_EXPORTED_API ReturnCode_t get_datareaders( std::vector& readers) const; /** @@ -236,7 +236,7 @@ class Subscriber : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_datareaders( + FASTDDS_EXPORTED_API ReturnCode_t get_datareaders( std::vector& readers, const std::vector& sample_states, const std::vector& view_states, @@ -247,7 +247,7 @@ class Subscriber : public DomainEntity * * @return true if the subscriber has one or several DataReaders, false in other case */ - RTPS_DllAPI bool has_datareaders() const; + FASTDDS_EXPORTED_API bool has_datareaders() const; /** * @brief Indicates that the application is about to access the data samples in any of the DataReader objects @@ -256,7 +256,7 @@ class Subscriber : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t begin_access(); + FASTDDS_EXPORTED_API ReturnCode_t begin_access(); /** * @brief Indicates that the application has finished accessing the data samples in DataReader objects managed by @@ -265,7 +265,7 @@ class Subscriber : public DomainEntity * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t end_access(); + FASTDDS_EXPORTED_API ReturnCode_t end_access(); /** @@ -277,7 +277,7 @@ class Subscriber : public DomainEntity * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t notify_datareaders() const; + FASTDDS_EXPORTED_API ReturnCode_t notify_datareaders() const; /** * @brief Deletes all contained DataReaders. If the DataReaders have any QueryCondition or ReadCondition, they are @@ -285,7 +285,7 @@ class Subscriber : public DomainEntity * * @return RETCODE_OK if successful, an error code otherwise */ - RTPS_DllAPI ReturnCode_t delete_contained_entities(); + FASTDDS_EXPORTED_API ReturnCode_t delete_contained_entities(); /** * This operation sets a default value of the DataReader QoS policies which will be used for newly created @@ -301,7 +301,7 @@ class Subscriber : public DomainEntity * @param qos new value for DataReaderQos to set as default * @return RETCODE_INCONSISTENT_POLICY if the Qos is not self consistent and RETCODE_OK if the qos is changed correctly. */ - RTPS_DllAPI ReturnCode_t set_default_datareader_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_default_datareader_qos( const DataReaderQos& qos); /** @@ -314,7 +314,7 @@ class Subscriber : public DomainEntity * * @return Current default DataReaderQos. */ - RTPS_DllAPI const DataReaderQos& get_default_datareader_qos() const; + FASTDDS_EXPORTED_API const DataReaderQos& get_default_datareader_qos() const; /** @@ -327,7 +327,7 @@ class Subscriber : public DomainEntity * * @return Current default DataReaderQos. */ - RTPS_DllAPI DataReaderQos& get_default_datareader_qos(); + FASTDDS_EXPORTED_API DataReaderQos& get_default_datareader_qos(); /** * This operation retrieves the default value of the DataReader QoS, that is, the QoS policies which will be @@ -340,7 +340,7 @@ class Subscriber : public DomainEntity * @param qos DataReaderQos where the default_qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_default_datareader_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_default_datareader_qos( DataReaderQos& qos) const; /** @@ -350,7 +350,7 @@ class Subscriber : public DomainEntity * @param qos DataReaderQos object where the qos is returned. * @return RETCODE_OK if the profile exists. RETCODE_BAD_PARAMETER otherwise. */ - RTPS_DllAPI ReturnCode_t get_datareader_qos_from_profile( + FASTDDS_EXPORTED_API ReturnCode_t get_datareader_qos_from_profile( const std::string& profile_name, DataReaderQos& qos) const; @@ -362,7 +362,7 @@ class Subscriber : public DomainEntity * @return RETCODE_OK if successful, an error code otherwise * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI static ReturnCode_t copy_from_topic_qos( + FASTDDS_EXPORTED_API static ReturnCode_t copy_from_topic_qos( DataReaderQos& reader_qos, const TopicQos& topic_qos); @@ -371,14 +371,14 @@ class Subscriber : public DomainEntity * * @return DomainParticipant Pointer */ - RTPS_DllAPI const DomainParticipant* get_participant() const; + FASTDDS_EXPORTED_API const DomainParticipant* get_participant() const; /** * Returns the Subscriber's handle. * * @return InstanceHandle of this Subscriber. */ - RTPS_DllAPI const InstanceHandle_t& get_instance_handle() const; + FASTDDS_EXPORTED_API const InstanceHandle_t& get_instance_handle() const; protected: diff --git a/include/fastdds/dds/subscriber/SubscriberListener.hpp b/include/fastdds/dds/subscriber/SubscriberListener.hpp index 25f2b411e37..c70af5f5f8e 100644 --- a/include/fastdds/dds/subscriber/SubscriberListener.hpp +++ b/include/fastdds/dds/subscriber/SubscriberListener.hpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -44,14 +44,14 @@ class SubscriberListener : public DataReaderListener /** * @brief Constructor */ - RTPS_DllAPI SubscriberListener() + FASTDDS_EXPORTED_API SubscriberListener() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~SubscriberListener() + FASTDDS_EXPORTED_API virtual ~SubscriberListener() { } @@ -61,7 +61,7 @@ class SubscriberListener : public DataReaderListener * * @param sub Subscriber */ - RTPS_DllAPI virtual void on_data_on_readers( + FASTDDS_EXPORTED_API virtual void on_data_on_readers( Subscriber* sub) { (void)sub; diff --git a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp index 6dc01c45f34..49cffe3b1cb 100644 --- a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp +++ b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -42,14 +42,14 @@ class RTPSReliableReaderQos /** * @brief Constructor */ - RTPS_DllAPI RTPSReliableReaderQos() + FASTDDS_EXPORTED_API RTPSReliableReaderQos() { } /** * @brief Destructor */ - virtual RTPS_DllAPI ~RTPSReliableReaderQos() = default; + virtual FASTDDS_EXPORTED_API ~RTPSReliableReaderQos() = default; bool operator ==( const RTPSReliableReaderQos& b) const @@ -83,12 +83,12 @@ class ReaderResourceLimitsQos /** * @brief Constructor */ - RTPS_DllAPI ReaderResourceLimitsQos() = default; + FASTDDS_EXPORTED_API ReaderResourceLimitsQos() = default; /** * @brief Destructor */ - virtual RTPS_DllAPI ~ReaderResourceLimitsQos() = default; + virtual FASTDDS_EXPORTED_API ~ReaderResourceLimitsQos() = default; bool operator ==( const ReaderResourceLimitsQos& b) const @@ -134,7 +134,7 @@ class TypeConsistencyQos : public QosPolicy /** * @brief Constructor */ - RTPS_DllAPI TypeConsistencyQos() + FASTDDS_EXPORTED_API TypeConsistencyQos() : QosPolicy(false) { } @@ -142,7 +142,7 @@ class TypeConsistencyQos : public QosPolicy /** * @brief Destructor */ - virtual RTPS_DllAPI ~TypeConsistencyQos() = default; + virtual FASTDDS_EXPORTED_API ~TypeConsistencyQos() = default; bool operator ==( const TypeConsistencyQos& b) const @@ -179,12 +179,12 @@ class DataReaderQos /** * @brief Constructor */ - RTPS_DllAPI DataReaderQos() + FASTDDS_EXPORTED_API DataReaderQos() : expects_inline_qos_(false) { } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const DataReaderQos& b) const { return (durability_ == b.durability()) && @@ -210,7 +210,7 @@ class DataReaderQos (data_sharing_ == b.data_sharing()); } - RTPS_DllAPI ReaderQos get_readerqos( + FASTDDS_EXPORTED_API ReaderQos get_readerqos( const SubscriberQos& sqos) const; /** @@ -218,7 +218,7 @@ class DataReaderQos * * @return DurabilityQosPolicy reference */ - RTPS_DllAPI DurabilityQosPolicy& durability() + FASTDDS_EXPORTED_API DurabilityQosPolicy& durability() { return durability_; } @@ -228,7 +228,7 @@ class DataReaderQos * * @return DurabilityQosPolicy const reference */ - RTPS_DllAPI const DurabilityQosPolicy& durability() const + FASTDDS_EXPORTED_API const DurabilityQosPolicy& durability() const { return durability_; } @@ -238,7 +238,7 @@ class DataReaderQos * * @param new_value new value for the DurabilityQosPolicy */ - RTPS_DllAPI void durability( + FASTDDS_EXPORTED_API void durability( const DurabilityQosPolicy& new_value) { durability_ = new_value; @@ -249,7 +249,7 @@ class DataReaderQos * * @return DeadlineQosPolicy reference */ - RTPS_DllAPI DeadlineQosPolicy& deadline() + FASTDDS_EXPORTED_API DeadlineQosPolicy& deadline() { return deadline_; } @@ -259,7 +259,7 @@ class DataReaderQos * * @return DeadlineQosPolicy const reference */ - RTPS_DllAPI const DeadlineQosPolicy& deadline() const + FASTDDS_EXPORTED_API const DeadlineQosPolicy& deadline() const { return deadline_; } @@ -269,7 +269,7 @@ class DataReaderQos * * @param new_value new value for the DeadlineQosPolicy */ - RTPS_DllAPI void deadline( + FASTDDS_EXPORTED_API void deadline( const DeadlineQosPolicy& new_value) { deadline_ = new_value; @@ -280,7 +280,7 @@ class DataReaderQos * * @return LatencyBudgetQosPolicy reference */ - RTPS_DllAPI LatencyBudgetQosPolicy& latency_budget() + FASTDDS_EXPORTED_API LatencyBudgetQosPolicy& latency_budget() { return latency_budget_; } @@ -290,7 +290,7 @@ class DataReaderQos * * @return LatencyBudgetQosPolicy const reference */ - RTPS_DllAPI const LatencyBudgetQosPolicy& latency_budget() const + FASTDDS_EXPORTED_API const LatencyBudgetQosPolicy& latency_budget() const { return latency_budget_; } @@ -300,7 +300,7 @@ class DataReaderQos * * @param new_value new value for the LatencyBudgetQosPolicy */ - RTPS_DllAPI void latency_budget( + FASTDDS_EXPORTED_API void latency_budget( const LatencyBudgetQosPolicy& new_value) { latency_budget_ = new_value; @@ -311,7 +311,7 @@ class DataReaderQos * * @return LivelinessQosPolicy reference */ - RTPS_DllAPI LivelinessQosPolicy& liveliness() + FASTDDS_EXPORTED_API LivelinessQosPolicy& liveliness() { return liveliness_; } @@ -321,7 +321,7 @@ class DataReaderQos * * @return LivelinessQosPolicy const reference */ - RTPS_DllAPI const LivelinessQosPolicy& liveliness() const + FASTDDS_EXPORTED_API const LivelinessQosPolicy& liveliness() const { return liveliness_; } @@ -331,7 +331,7 @@ class DataReaderQos * * @param new_value new value for the LivelinessQosPolicy */ - RTPS_DllAPI void liveliness( + FASTDDS_EXPORTED_API void liveliness( const LivelinessQosPolicy& new_value) { liveliness_ = new_value; @@ -342,7 +342,7 @@ class DataReaderQos * * @return ReliabilityQosPolicy reference */ - RTPS_DllAPI ReliabilityQosPolicy& reliability() + FASTDDS_EXPORTED_API ReliabilityQosPolicy& reliability() { return reliability_; } @@ -352,7 +352,7 @@ class DataReaderQos * * @return ReliabilityQosPolicy const reference */ - RTPS_DllAPI const ReliabilityQosPolicy& reliability() const + FASTDDS_EXPORTED_API const ReliabilityQosPolicy& reliability() const { return reliability_; } @@ -362,7 +362,7 @@ class DataReaderQos * * @param new_value new value for the ReliabilityQosPolicy */ - RTPS_DllAPI void reliability( + FASTDDS_EXPORTED_API void reliability( const ReliabilityQosPolicy& new_value) { reliability_ = new_value; @@ -373,7 +373,7 @@ class DataReaderQos * * @return DestinationOrderQosPolicy reference */ - RTPS_DllAPI DestinationOrderQosPolicy& destination_order() + FASTDDS_EXPORTED_API DestinationOrderQosPolicy& destination_order() { return destination_order_; } @@ -383,7 +383,7 @@ class DataReaderQos * * @return DestinationOrderQosPolicy const reference */ - RTPS_DllAPI const DestinationOrderQosPolicy& destination_order() const + FASTDDS_EXPORTED_API const DestinationOrderQosPolicy& destination_order() const { return destination_order_; } @@ -393,7 +393,7 @@ class DataReaderQos * * @param new_value new value for the DestinationOrderQosPolicy */ - RTPS_DllAPI void destination_order( + FASTDDS_EXPORTED_API void destination_order( const DestinationOrderQosPolicy& new_value) { destination_order_ = new_value; @@ -404,7 +404,7 @@ class DataReaderQos * * @return HistoryQosPolicy reference */ - RTPS_DllAPI HistoryQosPolicy& history() + FASTDDS_EXPORTED_API HistoryQosPolicy& history() { return history_; } @@ -414,7 +414,7 @@ class DataReaderQos * * @return HistoryQosPolicy const reference */ - RTPS_DllAPI const HistoryQosPolicy& history() const + FASTDDS_EXPORTED_API const HistoryQosPolicy& history() const { return history_; } @@ -424,7 +424,7 @@ class DataReaderQos * * @param new_value new value for the HistoryQosPolicy */ - RTPS_DllAPI void history( + FASTDDS_EXPORTED_API void history( const HistoryQosPolicy& new_value) { history_ = new_value; @@ -435,7 +435,7 @@ class DataReaderQos * * @return ResourceLimitsQosPolicy reference */ - RTPS_DllAPI ResourceLimitsQosPolicy& resource_limits() + FASTDDS_EXPORTED_API ResourceLimitsQosPolicy& resource_limits() { return resource_limits_; } @@ -445,7 +445,7 @@ class DataReaderQos * * @return ResourceLimitsQosPolicy const reference */ - RTPS_DllAPI const ResourceLimitsQosPolicy& resource_limits() const + FASTDDS_EXPORTED_API const ResourceLimitsQosPolicy& resource_limits() const { return resource_limits_; } @@ -455,7 +455,7 @@ class DataReaderQos * * @param new_value new value for the ResourceLimitsQosPolicy */ - RTPS_DllAPI void resource_limits( + FASTDDS_EXPORTED_API void resource_limits( const ResourceLimitsQosPolicy& new_value) { resource_limits_ = new_value; @@ -466,7 +466,7 @@ class DataReaderQos * * @return UserDataQosPolicy reference */ - RTPS_DllAPI UserDataQosPolicy& user_data() + FASTDDS_EXPORTED_API UserDataQosPolicy& user_data() { return user_data_; } @@ -476,7 +476,7 @@ class DataReaderQos * * @return UserDataQosPolicy const reference */ - RTPS_DllAPI const UserDataQosPolicy& user_data() const + FASTDDS_EXPORTED_API const UserDataQosPolicy& user_data() const { return user_data_; } @@ -486,7 +486,7 @@ class DataReaderQos * * @param new_value new value for the UserDataQosPolicy */ - RTPS_DllAPI void user_data( + FASTDDS_EXPORTED_API void user_data( const UserDataQosPolicy& new_value) { user_data_ = new_value; @@ -497,7 +497,7 @@ class DataReaderQos * * @return OwnershipQosPolicy reference */ - RTPS_DllAPI OwnershipQosPolicy& ownership() + FASTDDS_EXPORTED_API OwnershipQosPolicy& ownership() { return ownership_; } @@ -507,7 +507,7 @@ class DataReaderQos * * @return OwnershipQosPolicy const reference */ - RTPS_DllAPI const OwnershipQosPolicy& ownership() const + FASTDDS_EXPORTED_API const OwnershipQosPolicy& ownership() const { return ownership_; } @@ -517,7 +517,7 @@ class DataReaderQos * * @param new_value new value for the OwnershipQosPolicy */ - RTPS_DllAPI void ownership( + FASTDDS_EXPORTED_API void ownership( const OwnershipQosPolicy& new_value) { ownership_ = new_value; @@ -528,7 +528,7 @@ class DataReaderQos * * @return TimeBasedFilterQosPolicy reference */ - RTPS_DllAPI TimeBasedFilterQosPolicy& time_based_filter() + FASTDDS_EXPORTED_API TimeBasedFilterQosPolicy& time_based_filter() { return time_based_filter_; } @@ -538,7 +538,7 @@ class DataReaderQos * * @return TimeBasedFilterQosPolicy const reference */ - RTPS_DllAPI const TimeBasedFilterQosPolicy& time_based_filter() const + FASTDDS_EXPORTED_API const TimeBasedFilterQosPolicy& time_based_filter() const { return time_based_filter_; } @@ -548,7 +548,7 @@ class DataReaderQos * * @param new_value new value for the TimeBasedFilterQosPolicy */ - RTPS_DllAPI void time_based_filter( + FASTDDS_EXPORTED_API void time_based_filter( const TimeBasedFilterQosPolicy& new_value) { time_based_filter_ = new_value; @@ -559,7 +559,7 @@ class DataReaderQos * * @return ReaderDataLifecycleQosPolicy reference */ - RTPS_DllAPI ReaderDataLifecycleQosPolicy& reader_data_lifecycle() + FASTDDS_EXPORTED_API ReaderDataLifecycleQosPolicy& reader_data_lifecycle() { return reader_data_lifecycle_; } @@ -569,7 +569,7 @@ class DataReaderQos * * @return ReaderDataLifecycleQosPolicy const reference */ - RTPS_DllAPI const ReaderDataLifecycleQosPolicy& reader_data_lifecycle() const + FASTDDS_EXPORTED_API const ReaderDataLifecycleQosPolicy& reader_data_lifecycle() const { return reader_data_lifecycle_; } @@ -579,7 +579,7 @@ class DataReaderQos * * @param new_value new value for the ReaderDataLifecycleQosPolicy */ - RTPS_DllAPI void reader_data_lifecycle( + FASTDDS_EXPORTED_API void reader_data_lifecycle( const ReaderDataLifecycleQosPolicy& new_value) { reader_data_lifecycle_ = new_value; @@ -590,7 +590,7 @@ class DataReaderQos * * @return LifespanQosPolicy reference */ - RTPS_DllAPI LifespanQosPolicy& lifespan() + FASTDDS_EXPORTED_API LifespanQosPolicy& lifespan() { return lifespan_; } @@ -600,7 +600,7 @@ class DataReaderQos * * @return LifespanQosPolicy const reference */ - RTPS_DllAPI const LifespanQosPolicy& lifespan() const + FASTDDS_EXPORTED_API const LifespanQosPolicy& lifespan() const { return lifespan_; } @@ -610,7 +610,7 @@ class DataReaderQos * * @param new_value new value for the LifespanQosPolicy */ - RTPS_DllAPI void lifespan( + FASTDDS_EXPORTED_API void lifespan( const LifespanQosPolicy& new_value) { lifespan_ = new_value; @@ -621,7 +621,7 @@ class DataReaderQos * * @return DurabilityServiceQosPolicy reference */ - RTPS_DllAPI DurabilityServiceQosPolicy& durability_service() + FASTDDS_EXPORTED_API DurabilityServiceQosPolicy& durability_service() { return durability_service_; } @@ -631,7 +631,7 @@ class DataReaderQos * * @return DurabilityServiceQosPolicy const reference */ - RTPS_DllAPI const DurabilityServiceQosPolicy& durability_service() const + FASTDDS_EXPORTED_API const DurabilityServiceQosPolicy& durability_service() const { return durability_service_; } @@ -641,7 +641,7 @@ class DataReaderQos * * @param new_value new value for the DurabilityServiceQosPolicy */ - RTPS_DllAPI void durability_service( + FASTDDS_EXPORTED_API void durability_service( const DurabilityServiceQosPolicy& new_value) { durability_service_ = new_value; @@ -652,7 +652,7 @@ class DataReaderQos * * @return RTPSReliableReaderQos reference */ - RTPS_DllAPI RTPSReliableReaderQos& reliable_reader_qos() + FASTDDS_EXPORTED_API RTPSReliableReaderQos& reliable_reader_qos() { return reliable_reader_qos_; } @@ -662,7 +662,7 @@ class DataReaderQos * * @return RTPSReliableReaderQos const reference */ - RTPS_DllAPI const RTPSReliableReaderQos& reliable_reader_qos() const + FASTDDS_EXPORTED_API const RTPSReliableReaderQos& reliable_reader_qos() const { return reliable_reader_qos_; } @@ -672,7 +672,7 @@ class DataReaderQos * * @param new_value new value for the RTPSReliableReaderQos */ - RTPS_DllAPI void reliable_reader_qos( + FASTDDS_EXPORTED_API void reliable_reader_qos( const RTPSReliableReaderQos& new_value) { reliable_reader_qos_ = new_value; @@ -683,7 +683,7 @@ class DataReaderQos * * @return TypeConsistencyQos reference */ - RTPS_DllAPI TypeConsistencyQos& type_consistency() + FASTDDS_EXPORTED_API TypeConsistencyQos& type_consistency() { return type_consistency_; } @@ -693,7 +693,7 @@ class DataReaderQos * * @return TypeConsistencyQos const reference */ - RTPS_DllAPI const TypeConsistencyQos& type_consistency() const + FASTDDS_EXPORTED_API const TypeConsistencyQos& type_consistency() const { return type_consistency_; } @@ -703,7 +703,7 @@ class DataReaderQos * * @param new_value new value for the TypeConsistencyQos */ - RTPS_DllAPI void type_consistency( + FASTDDS_EXPORTED_API void type_consistency( const TypeConsistencyQos& new_value) { type_consistency_ = new_value; @@ -714,7 +714,7 @@ class DataReaderQos * * @return expectsInlineQos */ - RTPS_DllAPI bool expects_inline_qos() const + FASTDDS_EXPORTED_API bool expects_inline_qos() const { return expects_inline_qos_; } @@ -724,7 +724,7 @@ class DataReaderQos * * @param new_value new value for the expectsInlineQos */ - RTPS_DllAPI void expects_inline_qos( + FASTDDS_EXPORTED_API void expects_inline_qos( bool new_value) { expects_inline_qos_ = new_value; @@ -735,7 +735,7 @@ class DataReaderQos * * @return PropertyPolicyQos reference */ - RTPS_DllAPI PropertyPolicyQos& properties() + FASTDDS_EXPORTED_API PropertyPolicyQos& properties() { return properties_; } @@ -745,7 +745,7 @@ class DataReaderQos * * @return PropertyPolicyQos const reference */ - RTPS_DllAPI const PropertyPolicyQos& properties() const + FASTDDS_EXPORTED_API const PropertyPolicyQos& properties() const { return properties_; } @@ -755,7 +755,7 @@ class DataReaderQos * * @param new_value new value for the PropertyPolicyQos */ - RTPS_DllAPI void properties( + FASTDDS_EXPORTED_API void properties( const PropertyPolicyQos& new_value) { properties_ = new_value; @@ -766,7 +766,7 @@ class DataReaderQos * * @return RTPSEndpointQos reference */ - RTPS_DllAPI RTPSEndpointQos& endpoint() + FASTDDS_EXPORTED_API RTPSEndpointQos& endpoint() { return endpoint_; } @@ -776,7 +776,7 @@ class DataReaderQos * * @return RTPSEndpointQos const reference */ - RTPS_DllAPI const RTPSEndpointQos& endpoint() const + FASTDDS_EXPORTED_API const RTPSEndpointQos& endpoint() const { return endpoint_; } @@ -786,7 +786,7 @@ class DataReaderQos * * @param new_value new value for the RTPSEndpointQos */ - RTPS_DllAPI void endpoint( + FASTDDS_EXPORTED_API void endpoint( const RTPSEndpointQos& new_value) { endpoint_ = new_value; @@ -797,7 +797,7 @@ class DataReaderQos * * @return ReaderResourceLimitsQos reference */ - RTPS_DllAPI ReaderResourceLimitsQos& reader_resource_limits() + FASTDDS_EXPORTED_API ReaderResourceLimitsQos& reader_resource_limits() { return reader_resource_limits_; } @@ -807,7 +807,7 @@ class DataReaderQos * * @return ReaderResourceLimitsQos const reference */ - RTPS_DllAPI const ReaderResourceLimitsQos& reader_resource_limits() const + FASTDDS_EXPORTED_API const ReaderResourceLimitsQos& reader_resource_limits() const { return reader_resource_limits_; } @@ -817,7 +817,7 @@ class DataReaderQos * * @param new_value new value for the ReaderResourceLimitsQos */ - RTPS_DllAPI void reader_resource_limits( + FASTDDS_EXPORTED_API void reader_resource_limits( const ReaderResourceLimitsQos& new_value) { reader_resource_limits_ = new_value; @@ -828,7 +828,7 @@ class DataReaderQos * * @return DataSharingQosPolicy reference */ - RTPS_DllAPI DataSharingQosPolicy& data_sharing() + FASTDDS_EXPORTED_API DataSharingQosPolicy& data_sharing() { return data_sharing_; } @@ -838,7 +838,7 @@ class DataReaderQos * * @return DataSharingQosPolicy reference */ - RTPS_DllAPI const DataSharingQosPolicy& data_sharing() const + FASTDDS_EXPORTED_API const DataSharingQosPolicy& data_sharing() const { return data_sharing_; } @@ -848,7 +848,7 @@ class DataReaderQos * * @param data_sharing new value for the DataSharingQosPolicy */ - RTPS_DllAPI void data_sharing( + FASTDDS_EXPORTED_API void data_sharing( const DataSharingQosPolicy& data_sharing) { data_sharing_ = data_sharing; @@ -920,7 +920,7 @@ class DataReaderQos DataSharingQosPolicy data_sharing_; }; -RTPS_DllAPI extern const DataReaderQos DATAREADER_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const DataReaderQos DATAREADER_QOS_DEFAULT; } // namespace dds } // namespace fastdds diff --git a/include/fastdds/dds/subscriber/qos/ReaderQos.hpp b/include/fastdds/dds/subscriber/qos/ReaderQos.hpp index 44e20180225..ac8a42a9126 100644 --- a/include/fastdds/dds/subscriber/qos/ReaderQos.hpp +++ b/include/fastdds/dds/subscriber/qos/ReaderQos.hpp @@ -37,11 +37,11 @@ class ReaderQos { public: - RTPS_DllAPI ReaderQos() + FASTDDS_EXPORTED_API ReaderQos() { } - RTPS_DllAPI virtual ~ReaderQos() + FASTDDS_EXPORTED_API virtual ~ReaderQos() { } @@ -131,7 +131,7 @@ class ReaderQos * @param readerqos Reference from a ReaderQos object. * @param first_time Boolean indicating whether is the first time (If not some parameters cannot be set). */ - RTPS_DllAPI void setQos( + FASTDDS_EXPORTED_API void setQos( const ReaderQos& readerqos, bool first_time); @@ -139,14 +139,14 @@ class ReaderQos * Check if the Qos values are compatible between each other. * @return True if correct. */ - RTPS_DllAPI bool checkQos() const; + FASTDDS_EXPORTED_API bool checkQos() const; /** * Check if the Qos can be update with the values provided. This method DOES NOT update anything. * @param qos Reference to the new qos. * @return True if they can be updated. */ - RTPS_DllAPI bool canQosBeUpdated( + FASTDDS_EXPORTED_API bool canQosBeUpdated( const ReaderQos& qos) const; void clear(); diff --git a/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp b/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp index 7aa16a2b1e1..11c74a871c9 100644 --- a/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp +++ b/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp @@ -41,14 +41,14 @@ class SubscriberQos /** * @brief Constructor */ - RTPS_DllAPI SubscriberQos() + FASTDDS_EXPORTED_API SubscriberQos() { } /** * @brief Destructor */ - RTPS_DllAPI virtual ~SubscriberQos() + FASTDDS_EXPORTED_API virtual ~SubscriberQos() { } @@ -200,7 +200,7 @@ class SubscriberQos EntityFactoryQosPolicy entity_factory_; }; -RTPS_DllAPI extern const SubscriberQos SUBSCRIBER_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const SubscriberQos SUBSCRIBER_QOS_DEFAULT; } /* namespace dds */ diff --git a/include/fastdds/dds/topic/ContentFilteredTopic.hpp b/include/fastdds/dds/topic/ContentFilteredTopic.hpp index 0935c408a48..6652e5dd7ed 100644 --- a/include/fastdds/dds/topic/ContentFilteredTopic.hpp +++ b/include/fastdds/dds/topic/ContentFilteredTopic.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_ #define _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_ -#include +#include #include #include @@ -64,7 +64,7 @@ class ContentFilteredTopic : public TopicDescription * This operation returns the Topic associated with the ContentFilteredTopic. * That is, the Topic specified when the ContentFilteredTopic was created. */ - RTPS_DllAPI Topic* get_related_topic() const; + FASTDDS_EXPORTED_API Topic* get_related_topic() const; /** * @brief Get the filter expression. @@ -75,7 +75,7 @@ class ContentFilteredTopic : public TopicDescription * * @return the @c filter_expression. */ - RTPS_DllAPI const std::string& get_filter_expression() const; + FASTDDS_EXPORTED_API const std::string& get_filter_expression() const; /** * @brief Get the expression parameters. @@ -91,7 +91,7 @@ class ContentFilteredTopic : public TopicDescription * * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_expression_parameters( + FASTDDS_EXPORTED_API ReturnCode_t get_expression_parameters( std::vector& expression_parameters) const; /** @@ -104,7 +104,7 @@ class ContentFilteredTopic : public TopicDescription * @return RETCODE_OK if the expression parameters where correctly updated. * @return RETCODE_BAD_PARAMETER if the expression parameters do not match with the current @c filter_expression. */ - RTPS_DllAPI ReturnCode_t set_expression_parameters( + FASTDDS_EXPORTED_API ReturnCode_t set_expression_parameters( const std::vector& expression_parameters); /** @@ -120,7 +120,7 @@ class ContentFilteredTopic : public TopicDescription * @return RETCODE_BAD_PARAMETER if @c filter_expression is not valid for this ContentFilteredTopic. * @return RETCODE_BAD_PARAMETER if the expression parameters do not match with the @c filter_expression. */ - RTPS_DllAPI ReturnCode_t set_filter_expression( + FASTDDS_EXPORTED_API ReturnCode_t set_filter_expression( const std::string& filter_expression, const std::vector& expression_parameters); @@ -128,7 +128,7 @@ class ContentFilteredTopic : public TopicDescription * @brief Getter for the DomainParticipant * @return DomainParticipant pointer */ - RTPS_DllAPI DomainParticipant* get_participant() const override; + FASTDDS_EXPORTED_API DomainParticipant* get_participant() const override; TopicDescriptionImpl* get_impl() const override; diff --git a/include/fastdds/dds/topic/IContentFilter.hpp b/include/fastdds/dds/topic/IContentFilter.hpp index 62449bc68f9..3c91414ae6a 100644 --- a/include/fastdds/dds/topic/IContentFilter.hpp +++ b/include/fastdds/dds/topic/IContentFilter.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_ #define _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_ -#include +#include #include diff --git a/include/fastdds/dds/topic/IContentFilterFactory.hpp b/include/fastdds/dds/topic/IContentFilterFactory.hpp index 598767b1b81..d860df1f39d 100644 --- a/include/fastdds/dds/topic/IContentFilterFactory.hpp +++ b/include/fastdds/dds/topic/IContentFilterFactory.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_ #define _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_ -#include +#include #include #include diff --git a/include/fastdds/dds/topic/Topic.hpp b/include/fastdds/dds/topic/Topic.hpp index e44afb4e605..2139a3cc3d5 100644 --- a/include/fastdds/dds/topic/Topic.hpp +++ b/include/fastdds/dds/topic/Topic.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_TOPIC_HPP_ #define _FASTDDS_TOPIC_HPP_ -#include +#include #include #include #include @@ -91,7 +91,7 @@ class Topic : public DomainEntity, public TopicDescription * @return RETCODE_OK * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t get_inconsistent_topic_status( + FASTDDS_EXPORTED_API ReturnCode_t get_inconsistent_topic_status( InconsistentTopicStatus& status); /** @@ -99,7 +99,7 @@ class Topic : public DomainEntity, public TopicDescription * * @return reference to TopicQos */ - RTPS_DllAPI const TopicQos& get_qos() const; + FASTDDS_EXPORTED_API const TopicQos& get_qos() const; /** * Retrieves the Topic Qos. @@ -107,7 +107,7 @@ class Topic : public DomainEntity, public TopicDescription * @param qos TopicQos where the qos is returned * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t get_qos( + FASTDDS_EXPORTED_API ReturnCode_t get_qos( TopicQos& qos) const; /** @@ -119,7 +119,7 @@ class Topic : public DomainEntity, public TopicDescription * @retval RETCODE_INCONSISTENT_POLICY if new qos has inconsistent values. * @retval RETCODE_OK if qos was updated. */ - RTPS_DllAPI ReturnCode_t set_qos( + FASTDDS_EXPORTED_API ReturnCode_t set_qos( const TopicQos& qos); /** @@ -127,7 +127,7 @@ class Topic : public DomainEntity, public TopicDescription * * @return pointer to TopicListener */ - RTPS_DllAPI const TopicListener* get_listener() const; + FASTDDS_EXPORTED_API const TopicListener* get_listener() const; /** * Modifies the TopicListener. @@ -136,7 +136,7 @@ class Topic : public DomainEntity, public TopicDescription * @param mask StatusMask that holds statuses the listener responds to (default: all). * @return RETCODE_OK */ - RTPS_DllAPI ReturnCode_t set_listener( + FASTDDS_EXPORTED_API ReturnCode_t set_listener( TopicListener* listener, const StatusMask& mask = StatusMask::all()); diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index e06f450bdf2..c6586f1e9c1 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include // This version of TypeSupport has `is_bounded()` @@ -66,12 +66,12 @@ class TopicDataType /** * @brief Constructor */ - RTPS_DllAPI TopicDataType(); + FASTDDS_EXPORTED_API TopicDataType(); /** * @brief Destructor */ - RTPS_DllAPI virtual ~TopicDataType(); + FASTDDS_EXPORTED_API virtual ~TopicDataType(); /** * Serialize method, it should be implemented by the user, since it is abstract. @@ -83,7 +83,7 @@ class TopicDataType */ // TODO(jlbueno) Remove when Fast DDS-Gen is updated // FASTDDS_TODO_BEFORE(3, 0, "Remove this overload") - RTPS_DllAPI virtual bool serialize( + FASTDDS_EXPORTED_API virtual bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload) = 0; @@ -97,7 +97,7 @@ class TopicDataType * @param[in] data_representation Representation that should be used to encode the data into the payload. * @return True if correct. */ - RTPS_DllAPI virtual bool serialize( + FASTDDS_EXPORTED_API virtual bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation); @@ -109,7 +109,7 @@ class TopicDataType * @param[out] data Pointer to the data * @return True if correct. */ - RTPS_DllAPI virtual bool deserialize( + FASTDDS_EXPORTED_API virtual bool deserialize( fastrtps::rtps::SerializedPayload_t* payload, void* data) = 0; @@ -119,7 +119,7 @@ class TopicDataType * @param[in] data Pointer to data. * @return Functor which calculates the serialized size of the data. */ - RTPS_DllAPI virtual std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API virtual std::function getSerializedSizeProvider( void* data) = 0; /*! @@ -129,7 +129,7 @@ class TopicDataType * @param[in] data_representation Representation that should be used for calculating the serialized size. * @return Functor which calculates the serialized size of the data. */ - RTPS_DllAPI virtual std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API virtual std::function getSerializedSizeProvider( void* data, DataRepresentationId_t data_representation); @@ -138,13 +138,13 @@ class TopicDataType * * @return Void pointer to the created object. */ - RTPS_DllAPI virtual void* createData() = 0; + FASTDDS_EXPORTED_API virtual void* createData() = 0; /** * Remove a previously created object. * * @param data Pointer to the created Data. */ - RTPS_DllAPI virtual void deleteData( + FASTDDS_EXPORTED_API virtual void deleteData( void* data) = 0; /** @@ -155,7 +155,7 @@ class TopicDataType * @param[in] force_md5 Force MD5 checking. * @return True if correct. */ - RTPS_DllAPI virtual bool getKey( + FASTDDS_EXPORTED_API virtual bool getKey( void* data, fastrtps::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) = 0; @@ -165,7 +165,7 @@ class TopicDataType * * @param nam Topic data type name */ - RTPS_DllAPI inline void setName( + FASTDDS_EXPORTED_API inline void setName( const char* nam) { m_topicDataTypeName = std::string(nam); @@ -176,7 +176,7 @@ class TopicDataType * * @return Topic data type name */ - RTPS_DllAPI inline const char* getName() const + FASTDDS_EXPORTED_API inline const char* getName() const { return m_topicDataTypeName.c_str(); } @@ -186,7 +186,7 @@ class TopicDataType * * @return true if the type object should be auto-filled */ - RTPS_DllAPI inline bool auto_fill_type_object() const + FASTDDS_EXPORTED_API inline bool auto_fill_type_object() const { return auto_fill_type_object_; } @@ -196,7 +196,7 @@ class TopicDataType * * @param auto_fill_type_object new value to set */ - RTPS_DllAPI inline void auto_fill_type_object( + FASTDDS_EXPORTED_API inline void auto_fill_type_object( bool auto_fill_type_object) { auto_fill_type_object_ = auto_fill_type_object; @@ -207,7 +207,7 @@ class TopicDataType * * @return true if the type information should be auto-filled */ - RTPS_DllAPI inline bool auto_fill_type_information() const + FASTDDS_EXPORTED_API inline bool auto_fill_type_information() const { return auto_fill_type_information_; } @@ -217,7 +217,7 @@ class TopicDataType * * @param auto_fill_type_information new value to set */ - RTPS_DllAPI inline void auto_fill_type_information( + FASTDDS_EXPORTED_API inline void auto_fill_type_information( bool auto_fill_type_information) { auto_fill_type_information_ = auto_fill_type_information; @@ -228,7 +228,7 @@ class TopicDataType * * @return TypeIdV1 */ - RTPS_DllAPI inline const std::shared_ptr type_identifier() const + FASTDDS_EXPORTED_API inline const std::shared_ptr type_identifier() const { return type_identifier_; } @@ -238,7 +238,7 @@ class TopicDataType * * @param id new value for TypeIdV1 */ - RTPS_DllAPI inline void type_identifier( + FASTDDS_EXPORTED_API inline void type_identifier( const TypeIdV1& id) { type_identifier_ = std::make_shared(id); @@ -249,7 +249,7 @@ class TopicDataType * * @param id shared pointer to TypeIdV1 */ - RTPS_DllAPI inline void type_identifier( + FASTDDS_EXPORTED_API inline void type_identifier( const std::shared_ptr id) { type_identifier_ = std::move(id); @@ -260,7 +260,7 @@ class TopicDataType * * @return TypeObjectV1 */ - RTPS_DllAPI inline const std::shared_ptr type_object() const + FASTDDS_EXPORTED_API inline const std::shared_ptr type_object() const { return type_object_; } @@ -270,7 +270,7 @@ class TopicDataType * * @param object new value for TypeObjectV1 */ - RTPS_DllAPI inline void type_object( + FASTDDS_EXPORTED_API inline void type_object( const TypeObjectV1& object) { type_object_ = std::make_shared(object); @@ -281,7 +281,7 @@ class TopicDataType * * @param object shared pointer to TypeObjectV1 */ - RTPS_DllAPI inline void type_object( + FASTDDS_EXPORTED_API inline void type_object( std::shared_ptr object) { type_object_ = std::move(object); @@ -292,7 +292,7 @@ class TopicDataType * * @return TypeInformation */ - RTPS_DllAPI inline const std::shared_ptr type_information() const + FASTDDS_EXPORTED_API inline const std::shared_ptr type_information() const { return type_information_; } @@ -302,7 +302,7 @@ class TopicDataType * * @param info new value for TypeInformation */ - RTPS_DllAPI inline void type_information( + FASTDDS_EXPORTED_API inline void type_information( const xtypes::TypeInformation& info) { type_information_ = std::make_shared(info); @@ -313,7 +313,7 @@ class TopicDataType * * @param info shared pointer to TypeInformation */ - RTPS_DllAPI inline void type_information( + FASTDDS_EXPORTED_API inline void type_information( std::shared_ptr info) { type_information_ = std::move(info); @@ -322,7 +322,7 @@ class TopicDataType /** * Checks if the type is bounded. */ - RTPS_DllAPI virtual inline bool is_bounded() const + FASTDDS_EXPORTED_API virtual inline bool is_bounded() const { return false; } @@ -330,7 +330,7 @@ class TopicDataType /** * Checks if the type is plain when using default encoding. */ - RTPS_DllAPI virtual inline bool is_plain() const + FASTDDS_EXPORTED_API virtual inline bool is_plain() const { return false; } @@ -338,7 +338,7 @@ class TopicDataType /** * Checks if the type is plain when using a specific encoding. */ - RTPS_DllAPI virtual inline bool is_plain( + FASTDDS_EXPORTED_API virtual inline bool is_plain( DataRepresentationId_t) const { return false; @@ -351,7 +351,7 @@ class TopicDataType * * @return whether this type supports in-place construction or not. */ - RTPS_DllAPI virtual inline bool construct_sample( + FASTDDS_EXPORTED_API virtual inline bool construct_sample( void* memory) const { static_cast(memory); diff --git a/include/fastdds/dds/topic/TopicListener.hpp b/include/fastdds/dds/topic/TopicListener.hpp index 61344fc52fd..6f5dd31a482 100644 --- a/include/fastdds/dds/topic/TopicListener.hpp +++ b/include/fastdds/dds/topic/TopicListener.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_TOPICLISTENER_HPP_ #define _FASTDDS_TOPICLISTENER_HPP_ -#include +#include #include namespace eprosima { @@ -33,7 +33,7 @@ class Topic; * * @ingroup FASTDDS_MODULE */ -class RTPS_DllAPI TopicListener +class FASTDDS_EXPORTED_API TopicListener { public: diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index 549dcd03e79..6b41414efe5 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -53,14 +53,14 @@ class TypeSupport : public std::shared_ptr /** * @brief Constructor */ - RTPS_DllAPI TypeSupport() noexcept = default; + FASTDDS_EXPORTED_API TypeSupport() noexcept = default; /** * @brief Copy Constructor * * @param type Another instance of TypeSupport */ - RTPS_DllAPI TypeSupport( + FASTDDS_EXPORTED_API TypeSupport( const TypeSupport& type) noexcept = default; /** @@ -68,7 +68,7 @@ class TypeSupport : public std::shared_ptr * * @param type Another instance of TypeSupport */ - RTPS_DllAPI TypeSupport( + FASTDDS_EXPORTED_API TypeSupport( TypeSupport&& type) noexcept = default; /** @@ -76,7 +76,7 @@ class TypeSupport : public std::shared_ptr * * @param type Another instance of TypeSupport */ - RTPS_DllAPI TypeSupport& operator = ( + FASTDDS_EXPORTED_API TypeSupport& operator = ( const TypeSupport& type) noexcept = default; /** @@ -84,7 +84,7 @@ class TypeSupport : public std::shared_ptr * * @param type Another instance of TypeSupport */ - RTPS_DllAPI TypeSupport& operator = ( + FASTDDS_EXPORTED_API TypeSupport& operator = ( TypeSupport&& type) noexcept = default; /*! @@ -94,7 +94,7 @@ class TypeSupport : public std::shared_ptr * * @param ptr */ - RTPS_DllAPI explicit TypeSupport( + FASTDDS_EXPORTED_API explicit TypeSupport( fastdds::dds::TopicDataType* ptr) : std::shared_ptr(ptr) { @@ -106,7 +106,7 @@ class TypeSupport : public std::shared_ptr * * @param ptr */ - RTPS_DllAPI TypeSupport( + FASTDDS_EXPORTED_API TypeSupport( fastrtps::types::DynamicPubSubType ptr) : std::shared_ptr(std::make_shared(std::move( ptr))) @@ -120,7 +120,7 @@ class TypeSupport : public std::shared_ptr * @return RETCODE_BAD_PARAMETER if the type name is empty, RETCODE_PRECONDITION_NOT_MET if there is another type with * the same name registered on the DomainParticipant and RETCODE_OK if it is registered correctly */ - RTPS_DllAPI virtual ReturnCode_t register_type( + FASTDDS_EXPORTED_API virtual ReturnCode_t register_type( DomainParticipant* participant) const; /** @@ -131,7 +131,7 @@ class TypeSupport : public std::shared_ptr * @return RETCODE_BAD_PARAMETER if the type name is empty, RETCODE_PRECONDITION_NOT_MET if there is another type with * the same name registered on the DomainParticipant and RETCODE_OK if it is registered correctly */ - RTPS_DllAPI virtual ReturnCode_t register_type( + FASTDDS_EXPORTED_API virtual ReturnCode_t register_type( DomainParticipant* participant, std::string type_name) const; @@ -140,7 +140,7 @@ class TypeSupport : public std::shared_ptr * * @return name of the data type */ - RTPS_DllAPI virtual const std::string& get_type_name() const + FASTDDS_EXPORTED_API virtual const std::string& get_type_name() const { return get()->m_topicDataTypeName; } @@ -153,7 +153,7 @@ class TypeSupport : public std::shared_ptr * @return true if it is serialized correctly, false if not */ - RTPS_DllAPI virtual bool serialize( + FASTDDS_EXPORTED_API virtual bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload) { @@ -168,7 +168,7 @@ class TypeSupport : public std::shared_ptr * @param[in] data_representation Representation that should be used to encode the data into the payload. * @return true if it is serialized correctly, false if not */ - RTPS_DllAPI virtual bool serialize( + FASTDDS_EXPORTED_API virtual bool serialize( void* data, fastrtps::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation); @@ -180,7 +180,7 @@ class TypeSupport : public std::shared_ptr * @param data Pointer to data * @return true if it is deserialized correctly, false if not */ - RTPS_DllAPI virtual bool deserialize( + FASTDDS_EXPORTED_API virtual bool deserialize( fastrtps::rtps::SerializedPayload_t* payload, void* data); @@ -190,7 +190,7 @@ class TypeSupport : public std::shared_ptr * @param[in] data Pointer to data. * @return Functor which calculates the serialized size of the data. */ - RTPS_DllAPI virtual std::function get_serialized_size_provider( + FASTDDS_EXPORTED_API virtual std::function get_serialized_size_provider( void* data) { return get_serialized_size_provider(data, DEFAULT_DATA_REPRESENTATION); @@ -203,7 +203,7 @@ class TypeSupport : public std::shared_ptr * @param[in] data_representation Representation that should be used for calculating the serialized size. * @return Functor which calculates the serialized size of the data. */ - RTPS_DllAPI virtual std::function get_serialized_size_provider( + FASTDDS_EXPORTED_API virtual std::function get_serialized_size_provider( void* data, DataRepresentationId_t data_representation) { @@ -215,7 +215,7 @@ class TypeSupport : public std::shared_ptr * * @return Pointer to the data */ - RTPS_DllAPI virtual void* create_data() + FASTDDS_EXPORTED_API virtual void* create_data() { return get()->createData(); } @@ -225,7 +225,7 @@ class TypeSupport : public std::shared_ptr * * @param data Pointer to the data to delete */ - RTPS_DllAPI virtual void delete_data( + FASTDDS_EXPORTED_API virtual void delete_data( void* data) { return get()->deleteData(data); @@ -239,7 +239,7 @@ class TypeSupport : public std::shared_ptr * @param force_md5 boolean to force md5 (default: false) * @return true if the key is returned, false if not */ - RTPS_DllAPI virtual bool get_key( + FASTDDS_EXPORTED_API virtual bool get_key( void* data, InstanceHandle_t* i_handle, bool force_md5 = false) @@ -247,7 +247,7 @@ class TypeSupport : public std::shared_ptr return get()->getKey(data, i_handle, force_md5); } - RTPS_DllAPI virtual bool operator ==( + FASTDDS_EXPORTED_API virtual bool operator ==( const TypeSupport& type_support) { return get()->m_typeSize == type_support->m_typeSize @@ -263,7 +263,7 @@ class TypeSupport : public std::shared_ptr * * @return true if empty, false if not */ - RTPS_DllAPI bool empty() const + FASTDDS_EXPORTED_API bool empty() const { return get() == nullptr; } @@ -271,7 +271,7 @@ class TypeSupport : public std::shared_ptr /** * Checks if the type is bounded. */ - RTPS_DllAPI virtual inline bool is_bounded() const + FASTDDS_EXPORTED_API virtual inline bool is_bounded() const { return get()->is_bounded(); } @@ -279,7 +279,7 @@ class TypeSupport : public std::shared_ptr /** * Checks if the type is plain when using default encoding. */ - RTPS_DllAPI virtual inline bool is_plain() const + FASTDDS_EXPORTED_API virtual inline bool is_plain() const { return is_plain(DataRepresentationId_t::XCDR_DATA_REPRESENTATION); } @@ -287,19 +287,19 @@ class TypeSupport : public std::shared_ptr /** * Checks if the type is plain when using a specific encoding. */ - RTPS_DllAPI virtual inline bool is_plain( + FASTDDS_EXPORTED_API virtual inline bool is_plain( DataRepresentationId_t data_representation) const { return get()->is_plain(data_representation); } - RTPS_DllAPI bool operator !=( + FASTDDS_EXPORTED_API bool operator !=( std::nullptr_t) const { return bool(*this); } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( std::nullptr_t) const { return !*this; diff --git a/include/fastdds/dds/topic/qos/TopicQos.hpp b/include/fastdds/dds/topic/qos/TopicQos.hpp index 0c64050bd35..d49347e6e2a 100644 --- a/include/fastdds/dds/topic/qos/TopicQos.hpp +++ b/include/fastdds/dds/topic/qos/TopicQos.hpp @@ -44,7 +44,7 @@ class TopicQos /** * @brief Constructor */ - RTPS_DllAPI TopicQos(); + FASTDDS_EXPORTED_API TopicQos(); bool operator ==( const TopicQos& b) const @@ -543,7 +543,7 @@ class TopicQos DataRepresentationQosPolicy representation_; }; -RTPS_DllAPI extern const TopicQos TOPIC_QOS_DEFAULT; +FASTDDS_EXPORTED_API extern const TopicQos TOPIC_QOS_DEFAULT; } // namespace dds } // namespace fastdds diff --git a/include/fastrtps/eProsima_auto_link.h b/include/fastdds/fastdds_auto_link.hpp similarity index 100% rename from include/fastrtps/eProsima_auto_link.h rename to include/fastdds/fastdds_auto_link.hpp diff --git a/include/fastrtps/fastrtps_dll.h b/include/fastdds/fastdds_dll.hpp similarity index 91% rename from include/fastrtps/fastrtps_dll.h rename to include/fastdds/fastdds_dll.hpp index a86cc5a55b8..7e1d58bc5a7 100644 --- a/include/fastrtps/fastrtps_dll.h +++ b/include/fastdds/fastdds_dll.hpp @@ -40,15 +40,15 @@ #if defined(_WIN32) #if defined(EPROSIMA_ALL_DYN_LINK) || defined(FASTDDS_DYN_LINK) #if defined(fastdds_EXPORTS) -#define RTPS_DllAPI __declspec( dllexport ) +#define FASTDDS_EXPORTED_API __declspec( dllexport ) #else -#define RTPS_DllAPI __declspec( dllimport ) +#define FASTDDS_EXPORTED_API __declspec( dllimport ) #endif // FASTDDS_SOURCE #else -#define RTPS_DllAPI +#define FASTDDS_EXPORTED_API #endif // if defined(EPROSIMA_ALL_DYN_LINK) || defined(FASTDDS_DYN_LINK) #else -#define RTPS_DllAPI +#define FASTDDS_EXPORTED_API #endif // _WIN32 // Auto linking. @@ -63,7 +63,7 @@ #define EPROSIMA_DYN_LINK #endif // if defined(EPROSIMA_ALL_DYN_LINK) || defined(FASTDDS_DYN_LINK) -#include +#include #endif // auto-linking disabled #endif // _FASTDDS_FASTDDS_DLL_H_ diff --git a/include/fastdds/rtps/Endpoint.h b/include/fastdds/rtps/Endpoint.h index e33588c0b14..22eeb64323f 100644 --- a/include/fastdds/rtps/Endpoint.h +++ b/include/fastdds/rtps/Endpoint.h @@ -78,7 +78,7 @@ class Endpoint * Get associated GUID * @return Associated GUID */ - RTPS_DllAPI inline const GUID_t& getGuid() const + FASTDDS_EXPORTED_API inline const GUID_t& getGuid() const { return m_guid; } @@ -87,7 +87,7 @@ class Endpoint * Get mutex * @return Associated Mutex */ - RTPS_DllAPI inline RecursiveTimedMutex& getMutex() + FASTDDS_EXPORTED_API inline RecursiveTimedMutex& getMutex() { return mp_mutex; } @@ -96,7 +96,7 @@ class Endpoint * Get associated attributes * @return Endpoint attributes */ - RTPS_DllAPI inline EndpointAttributes& getAttributes() + FASTDDS_EXPORTED_API inline EndpointAttributes& getAttributes() { return m_att; } diff --git a/include/fastdds/rtps/RTPSDomain.h b/include/fastdds/rtps/RTPSDomain.h index f234ec103b5..5e418abcb8f 100644 --- a/include/fastdds/rtps/RTPSDomain.h +++ b/include/fastdds/rtps/RTPSDomain.h @@ -65,7 +65,7 @@ class RTPSDomain * @param watch_thread Settings for the thread watching the environment file. * @param callback_thread Settings for the thread executing the callback when the environment file changed. */ - RTPS_DllAPI static void set_filewatch_thread_config( + FASTDDS_EXPORTED_API static void set_filewatch_thread_config( const fastdds::rtps::ThreadSettings& watch_thread, const fastdds::rtps::ThreadSettings& callback_thread); @@ -77,7 +77,7 @@ class RTPSDomain * \post After this call, all the pointers to RTPS entities are invalidated and their use may * result in undefined behaviour. */ - RTPS_DllAPI static void stopAll(); + FASTDDS_EXPORTED_API static void stopAll(); /** * @brief Create a RTPSParticipant. @@ -89,7 +89,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSParticipant() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSParticipant* createParticipant( + FASTDDS_EXPORTED_API static RTPSParticipant* createParticipant( uint32_t domain_id, const RTPSParticipantAttributes& attrs, RTPSParticipantListener* plisten = nullptr); @@ -105,7 +105,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSParticipant() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSParticipant* createParticipant( + FASTDDS_EXPORTED_API static RTPSParticipant* createParticipant( uint32_t domain_id, bool enabled, const RTPSParticipantAttributes& attrs, @@ -122,7 +122,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSWriter() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSWriter* createRTPSWriter( + FASTDDS_EXPORTED_API static RTPSWriter* createRTPSWriter( RTPSParticipant* p, WriterAttributes& watt, WriterHistory* hist, @@ -140,7 +140,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSWriter() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSWriter* createRTPSWriter( + FASTDDS_EXPORTED_API static RTPSWriter* createRTPSWriter( RTPSParticipant* p, WriterAttributes& watt, const std::shared_ptr& payload_pool, @@ -160,7 +160,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSWriter() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSWriter* createRTPSWriter( + FASTDDS_EXPORTED_API static RTPSWriter* createRTPSWriter( RTPSParticipant* p, WriterAttributes& watt, const std::shared_ptr& payload_pool, @@ -182,7 +182,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSWriter() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSWriter* createRTPSWriter( + FASTDDS_EXPORTED_API static RTPSWriter* createRTPSWriter( RTPSParticipant* p, const EntityId_t& entity_id, WriterAttributes& watt, @@ -204,7 +204,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSWriter() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSWriter* createRTPSWriter( + FASTDDS_EXPORTED_API static RTPSWriter* createRTPSWriter( RTPSParticipant* p, const EntityId_t& entity_id, WriterAttributes& watt, @@ -217,7 +217,7 @@ class RTPSDomain * @param writer Pointer to the writer you want to remove. * @return True if correctly removed. */ - RTPS_DllAPI static bool removeRTPSWriter( + FASTDDS_EXPORTED_API static bool removeRTPSWriter( RTPSWriter* writer); /** @@ -231,7 +231,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSReader() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSReader* createRTPSReader( + FASTDDS_EXPORTED_API static RTPSReader* createRTPSReader( RTPSParticipant* p, ReaderAttributes& ratt, ReaderHistory* hist, @@ -249,7 +249,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSReader() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSReader* createRTPSReader( + FASTDDS_EXPORTED_API static RTPSReader* createRTPSReader( RTPSParticipant* p, ReaderAttributes& ratt, const std::shared_ptr& payload_pool, @@ -269,7 +269,7 @@ class RTPSDomain * \warning The returned pointer is invalidated after a call to removeRTPSReader() or stopAll(), * so its use may result in undefined behaviour. */ - RTPS_DllAPI static RTPSReader* createRTPSReader( + FASTDDS_EXPORTED_API static RTPSReader* createRTPSReader( RTPSParticipant* p, const EntityId_t& entity_id, ReaderAttributes& ratt, @@ -282,7 +282,7 @@ class RTPSDomain * @param reader Pointer to the reader you want to remove. * @return True if correctly removed. */ - RTPS_DllAPI static bool removeRTPSReader( + FASTDDS_EXPORTED_API static bool removeRTPSReader( RTPSReader* reader); /** @@ -290,7 +290,7 @@ class RTPSDomain * @param[in] p Pointer to the RTPSParticipant; * @return True if correct. */ - RTPS_DllAPI static bool removeRTPSParticipant( + FASTDDS_EXPORTED_API static bool removeRTPSParticipant( RTPSParticipant* p); /** @@ -299,7 +299,7 @@ class RTPSDomain * @param library_settings LibrarySettings reference where the settings are returned. * @return True. */ - RTPS_DllAPI static bool get_library_settings( + FASTDDS_EXPORTED_API static bool get_library_settings( fastdds::LibrarySettings& library_settings); /** @@ -309,7 +309,7 @@ class RTPSDomain * @return False if there is any RTPSParticipant already created. * True if correctly set. */ - RTPS_DllAPI static bool set_library_settings( + FASTDDS_EXPORTED_API static bool set_library_settings( const fastdds::LibrarySettings& library_settings); /** @@ -320,7 +320,7 @@ class RTPSDomain * @return bool true if the profile exists. * false otherwise. */ - RTPS_DllAPI static bool get_topic_attributes_from_profile( + FASTDDS_EXPORTED_API static bool get_topic_attributes_from_profile( const std::string& profile_name, TopicAttributes& topic_att); diff --git a/include/fastdds/rtps/attributes/BuiltinTransports.hpp b/include/fastdds/rtps/attributes/BuiltinTransports.hpp index c3038cb618e..fe38051ccb7 100644 --- a/include/fastdds/rtps/attributes/BuiltinTransports.hpp +++ b/include/fastdds/rtps/attributes/BuiltinTransports.hpp @@ -21,9 +21,9 @@ #include #include -#include -#include +#include +#include namespace eprosima { namespace fastdds { @@ -33,7 +33,7 @@ namespace rtps { /** * @brief Options for configuring the built-in transports when using LARGE_DATA mode. */ -struct RTPS_DllAPI BuiltinTransportsOptions +struct FASTDDS_EXPORTED_API BuiltinTransportsOptions { //! Whether to use non-blocking send operation. bool non_blocking_send = false; diff --git a/include/fastdds/rtps/attributes/HistoryAttributes.h b/include/fastdds/rtps/attributes/HistoryAttributes.h index be1c6fccc36..1f45ec99ae2 100644 --- a/include/fastdds/rtps/attributes/HistoryAttributes.h +++ b/include/fastdds/rtps/attributes/HistoryAttributes.h @@ -21,7 +21,7 @@ #define _FASTDDS_HISTORYATTRIBUTES_H_ #include -#include +#include #include @@ -35,7 +35,7 @@ namespace rtps { * The Publisher-Subscriber API has other fields to define this values (HistoryQosPolicy and ResourceLimitsQosPolicy). * @ingroup RTPS_ATTRIBUTES_MODULE */ -class RTPS_DllAPI HistoryAttributes +class FASTDDS_EXPORTED_API HistoryAttributes { public: diff --git a/include/fastdds/rtps/attributes/PropertyPolicy.h b/include/fastdds/rtps/attributes/PropertyPolicy.h index 92f78e9c769..c38e495b8a7 100644 --- a/include/fastdds/rtps/attributes/PropertyPolicy.h +++ b/include/fastdds/rtps/attributes/PropertyPolicy.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace eprosima { namespace fastrtps { @@ -30,25 +30,25 @@ class PropertyPolicy { public: - RTPS_DllAPI PropertyPolicy() + FASTDDS_EXPORTED_API PropertyPolicy() { } - RTPS_DllAPI PropertyPolicy( + FASTDDS_EXPORTED_API PropertyPolicy( const PropertyPolicy& property_policy) : properties_(property_policy.properties_) , binary_properties_(property_policy.binary_properties_) { } - RTPS_DllAPI PropertyPolicy( + FASTDDS_EXPORTED_API PropertyPolicy( PropertyPolicy&& property_policy) : properties_(std::move(property_policy.properties_)) , binary_properties_(std::move(property_policy.binary_properties_)) { } - RTPS_DllAPI PropertyPolicy& operator =( + FASTDDS_EXPORTED_API PropertyPolicy& operator =( const PropertyPolicy& property_policy) { properties_ = property_policy.properties_; @@ -56,7 +56,7 @@ class PropertyPolicy return *this; } - RTPS_DllAPI PropertyPolicy& operator =( + FASTDDS_EXPORTED_API PropertyPolicy& operator =( PropertyPolicy&& property_policy) { properties_ = std::move(property_policy.properties_); @@ -64,7 +64,7 @@ class PropertyPolicy return *this; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const PropertyPolicy& b) const { return (this->properties_ == b.properties_) && @@ -72,25 +72,25 @@ class PropertyPolicy } //!Get properties - RTPS_DllAPI const PropertySeq& properties() const + FASTDDS_EXPORTED_API const PropertySeq& properties() const { return properties_; } //!Set properties - RTPS_DllAPI PropertySeq& properties() + FASTDDS_EXPORTED_API PropertySeq& properties() { return properties_; } //!Get binary_properties - RTPS_DllAPI const BinaryPropertySeq& binary_properties() const + FASTDDS_EXPORTED_API const BinaryPropertySeq& binary_properties() const { return binary_properties_; } //!Set binary_properties - RTPS_DllAPI BinaryPropertySeq& binary_properties() + FASTDDS_EXPORTED_API BinaryPropertySeq& binary_properties() { return binary_properties_; } @@ -113,21 +113,21 @@ class PropertyPolicyHelper * @param prefix Prefix used to search properties. * @return A copy of properties whose name starts with the prefix. */ - RTPS_DllAPI static PropertyPolicy get_properties_with_prefix( + FASTDDS_EXPORTED_API static PropertyPolicy get_properties_with_prefix( const PropertyPolicy& property_policy, const std::string& prefix); //!Get the length of the property_policy - RTPS_DllAPI static size_t length( + FASTDDS_EXPORTED_API static size_t length( const PropertyPolicy& property_policy); //!Look for a property_policy by name - RTPS_DllAPI static std::string* find_property( + FASTDDS_EXPORTED_API static std::string* find_property( PropertyPolicy& property_policy, const std::string& name); //!Retrieves a property_policy by name - RTPS_DllAPI static const std::string* find_property( + FASTDDS_EXPORTED_API static const std::string* find_property( const PropertyPolicy& property_policy, const std::string& name); @@ -137,7 +137,7 @@ class PropertyPolicyHelper * @param name Name of the property to be searched. * @return A pointer to the property if found, nullptr otherwise. */ - RTPS_DllAPI static const Property* get_property( + FASTDDS_EXPORTED_API static const Property* get_property( const PropertyPolicy& property_policy, const std::string& name); }; diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h index 213848d81ca..8adcfc7b7c7 100644 --- a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h +++ b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -474,7 +474,7 @@ class RTPSParticipantAttributes * @param transports Defines the transport configuration scenario to setup. * @param options Defines the options to be used in the transport configuration. */ - RTPS_DllAPI void setup_transports( + FASTDDS_EXPORTED_API void setup_transports( fastdds::rtps::BuiltinTransports transports, const fastdds::rtps::BuiltinTransportsOptions& options = fastdds::rtps::BuiltinTransportsOptions()); @@ -517,7 +517,7 @@ class RTPSParticipantAttributes //! Optionally allows user to define the GuidPrefix_t GuidPrefix_t prefix; - RTPS_DllAPI inline bool ReadguidPrefix( + FASTDDS_EXPORTED_API inline bool ReadguidPrefix( const char* pfx) { return bool(std::istringstream(pfx) >> prefix); diff --git a/include/fastdds/rtps/attributes/ServerAttributes.h b/include/fastdds/rtps/attributes/ServerAttributes.h index 0d006a3d125..4076cba29e2 100644 --- a/include/fastdds/rtps/attributes/ServerAttributes.h +++ b/include/fastdds/rtps/attributes/ServerAttributes.h @@ -48,7 +48,7 @@ class RemoteServerAttributes { public: - RTPS_DllAPI inline bool operator ==( + FASTDDS_EXPORTED_API inline bool operator ==( const RemoteServerAttributes& r) const { return guidPrefix == r.guidPrefix @@ -56,7 +56,7 @@ class RemoteServerAttributes && metatrafficMulticastLocatorList == r.metatrafficMulticastLocatorList; } - RTPS_DllAPI void clear() + FASTDDS_EXPORTED_API void clear() { guidPrefix = fastrtps::rtps::GuidPrefix_t::unknown(); metatrafficUnicastLocatorList.clear(); @@ -64,12 +64,12 @@ class RemoteServerAttributes is_connected = false; } - RTPS_DllAPI fastrtps::rtps::GUID_t GetParticipant() const; + FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetParticipant() const; - RTPS_DllAPI fastrtps::rtps::GUID_t GetPDPReader() const; - RTPS_DllAPI fastrtps::rtps::GUID_t GetPDPWriter() const; + FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetPDPReader() const; + FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetPDPWriter() const; - RTPS_DllAPI inline bool ReadguidPrefix( + FASTDDS_EXPORTED_API inline bool ReadguidPrefix( const char* pfx) { return bool(std::istringstream(pfx) >> guidPrefix); @@ -101,8 +101,8 @@ typedef std::list RemoteServerList_t; template struct server_ostream_separators { - RTPS_DllAPI static const charT* list_separator; - RTPS_DllAPI static const charT* locator_separator; + FASTDDS_EXPORTED_API static const charT* list_separator; + FASTDDS_EXPORTED_API static const charT* locator_separator; }; #ifndef _MSC_VER @@ -179,7 +179,7 @@ const char* const ROS_SUPER_CLIENT = "ROS_SUPER_CLIENT"; * @param[out] attributes reference to a RemoteServerList_t to populate. * @return true if parsing succeeds, false otherwise (or if the list is empty) */ -RTPS_DllAPI bool load_environment_server_info( +FASTDDS_EXPORTED_API bool load_environment_server_info( const std::string& list, RemoteServerList_t& attributes); @@ -196,20 +196,20 @@ RTPS_DllAPI bool load_environment_server_info( * @param[out] attributes reference to a RemoteServerList_t to populate. * @return true if parsing succeeds, false otherwise */ -RTPS_DllAPI bool load_environment_server_info( +FASTDDS_EXPORTED_API bool load_environment_server_info( RemoteServerList_t& attributes); /** * Get the value of environment variable DEFAULT_ROS2_MASTER_URI * @return The value of environment variable DEFAULT_ROS2_MASTER_URI. Empty string if the variable is not defined. */ -RTPS_DllAPI const std::string& ros_discovery_server_env(); +FASTDDS_EXPORTED_API const std::string& ros_discovery_server_env(); /** * Get the value of environment variable ROS_SUPER_CLIENT * @return The value of environment variable ROS_SUPER_CLIENT. False if the variable is not defined. */ -RTPS_DllAPI bool ros_super_client_env(); +FASTDDS_EXPORTED_API bool ros_super_client_env(); /** * Returns the guidPrefix associated to the given server id @@ -217,7 +217,7 @@ RTPS_DllAPI bool ros_super_client_env(); * @param[out] guid reference to the guidPrefix to modify * @return true if the server guid can be delivered */ -RTPS_DllAPI bool get_server_client_default_guidPrefix( +FASTDDS_EXPORTED_API bool get_server_client_default_guidPrefix( int id, fastrtps::rtps::GuidPrefix_t& guid); diff --git a/include/fastdds/rtps/attributes/ThreadSettings.hpp b/include/fastdds/rtps/attributes/ThreadSettings.hpp index ed2a85f0b9b..d6d39524ee3 100644 --- a/include/fastdds/rtps/attributes/ThreadSettings.hpp +++ b/include/fastdds/rtps/attributes/ThreadSettings.hpp @@ -19,7 +19,7 @@ #include #include -#include +#include #ifndef _FASTDDS_THREADSETTINGS_HPP_ #define _FASTDDS_THREADSETTINGS_HPP_ @@ -33,7 +33,7 @@ namespace rtps { * This class is used to define attributes across a wide set of Qos and APIs. * @ingroup RTPS_ATTRIBUTES_MODULE */ -struct RTPS_DllAPI ThreadSettings +struct FASTDDS_EXPORTED_API ThreadSettings { /** * @brief The scheduling policy used for this thread. diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.h b/include/fastdds/rtps/builtin/data/ParticipantProxyData.h index 03dbb4c10b6..3b87103de14 100644 --- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.h +++ b/include/fastdds/rtps/builtin/data/ParticipantProxyData.h @@ -63,13 +63,13 @@ class ParticipantProxyData { public: - RTPS_DllAPI ParticipantProxyData( + FASTDDS_EXPORTED_API ParticipantProxyData( const RTPSParticipantAllocationAttributes& allocation); - RTPS_DllAPI ParticipantProxyData( + FASTDDS_EXPORTED_API ParticipantProxyData( const ParticipantProxyData& pdata); - RTPS_DllAPI virtual ~ParticipantProxyData(); + FASTDDS_EXPORTED_API virtual ~ParticipantProxyData(); //!Protocol version ProtocolVersion_t m_protocolVersion; @@ -127,7 +127,7 @@ class ParticipantProxyData * @param pdata Object to copy the data from * @return True on success */ - RTPS_DllAPI bool updateData( + FASTDDS_EXPORTED_API bool updateData( ParticipantProxyData& pdata); /** @@ -135,14 +135,14 @@ class ParticipantProxyData * @param include_encapsulation Whether to include the size of the encapsulation info. * @return size in bytes of the CDR serialization. */ - RTPS_DllAPI uint32_t get_serialized_size( + FASTDDS_EXPORTED_API uint32_t get_serialized_size( bool include_encapsulation) const; /** * Write as a parameter list on a CDRMessage_t * @return True on success */ - RTPS_DllAPI bool writeToCDRMessage( + FASTDDS_EXPORTED_API bool writeToCDRMessage( CDRMessage_t* msg, bool write_encapsulation); @@ -150,7 +150,7 @@ class ParticipantProxyData * Read the parameter list from a received CDRMessage_t * @return True on success */ - RTPS_DllAPI bool readFromCDRMessage( + FASTDDS_EXPORTED_API bool readFromCDRMessage( CDRMessage_t* msg, bool use_encapsulation, const NetworkFactory& network, @@ -159,62 +159,62 @@ class ParticipantProxyData fastdds::rtps::VendorId_t source_vendor_id = c_VendorId_eProsima); //! Clear the data (restore to default state). - RTPS_DllAPI void clear(); + FASTDDS_EXPORTED_API void clear(); /** * Copy the data from another object. * @param pdata Object to copy the data from */ - RTPS_DllAPI void copy( + FASTDDS_EXPORTED_API void copy( const ParticipantProxyData& pdata); /** * Set participant persistent GUID_t * @param guid valid GUID_t */ - RTPS_DllAPI void set_persistence_guid( + FASTDDS_EXPORTED_API void set_persistence_guid( const GUID_t& guid); /** * Retrieve participant persistent GUID_t * @return guid persistent GUID_t or c_Guid_Unknown */ - RTPS_DllAPI GUID_t get_persistence_guid() const; + FASTDDS_EXPORTED_API GUID_t get_persistence_guid() const; /** * Set participant client server sample identity * @param sid valid SampleIdentity */ - RTPS_DllAPI void set_sample_identity( + FASTDDS_EXPORTED_API void set_sample_identity( const SampleIdentity& sid); /** * Retrieve participant SampleIdentity * @return SampleIdentity */ - RTPS_DllAPI SampleIdentity get_sample_identity() const; + FASTDDS_EXPORTED_API SampleIdentity get_sample_identity() const; /** * Identifies the participant as client of the given server * @param guid valid backup server GUID */ - RTPS_DllAPI void set_backup_stamp( + FASTDDS_EXPORTED_API void set_backup_stamp( const GUID_t& guid); /** * Retrieves BACKUP server stamp. On deserialization hints if lease duration must be enforced * @return GUID */ - RTPS_DllAPI GUID_t get_backup_stamp() const; + FASTDDS_EXPORTED_API GUID_t get_backup_stamp() const; - RTPS_DllAPI void assert_liveliness(); + FASTDDS_EXPORTED_API void assert_liveliness(); - RTPS_DllAPI const std::chrono::steady_clock::time_point& last_received_message_tm() const + FASTDDS_EXPORTED_API const std::chrono::steady_clock::time_point& last_received_message_tm() const { return last_received_message_tm_; } - RTPS_DllAPI const std::chrono::microseconds& lease_duration() const + FASTDDS_EXPORTED_API const std::chrono::microseconds& lease_duration() const { return lease_duration_; } diff --git a/include/fastdds/rtps/builtin/data/ReaderProxyData.h b/include/fastdds/rtps/builtin/data/ReaderProxyData.h index 0c41a3ae591..c15d4b9df29 100644 --- a/include/fastdds/rtps/builtin/data/ReaderProxyData.h +++ b/include/fastdds/rtps/builtin/data/ReaderProxyData.h @@ -48,80 +48,80 @@ class ReaderProxyData { public: - RTPS_DllAPI ReaderProxyData( + FASTDDS_EXPORTED_API ReaderProxyData( const size_t max_unicast_locators, const size_t max_multicast_locators, const fastdds::rtps::ContentFilterProperty::AllocationConfiguration& content_filter_limits = {}); - RTPS_DllAPI ReaderProxyData( + FASTDDS_EXPORTED_API ReaderProxyData( const size_t max_unicast_locators, const size_t max_multicast_locators, const VariableLengthDataLimits& data_limits, const fastdds::rtps::ContentFilterProperty::AllocationConfiguration& content_filter_limits = {}); - RTPS_DllAPI virtual ~ReaderProxyData(); + FASTDDS_EXPORTED_API virtual ~ReaderProxyData(); - RTPS_DllAPI ReaderProxyData( + FASTDDS_EXPORTED_API ReaderProxyData( const ReaderProxyData& readerInfo); - RTPS_DllAPI ReaderProxyData& operator =( + FASTDDS_EXPORTED_API ReaderProxyData& operator =( const ReaderProxyData& readerInfo); - RTPS_DllAPI void guid( + FASTDDS_EXPORTED_API void guid( const GUID_t& guid) { m_guid = guid; } - RTPS_DllAPI void guid( + FASTDDS_EXPORTED_API void guid( GUID_t&& guid) { m_guid = std::move(guid); } - RTPS_DllAPI const GUID_t& guid() const + FASTDDS_EXPORTED_API const GUID_t& guid() const { return m_guid; } - RTPS_DllAPI GUID_t& guid() + FASTDDS_EXPORTED_API GUID_t& guid() { return m_guid; } - RTPS_DllAPI void networkConfiguration( + FASTDDS_EXPORTED_API void networkConfiguration( const NetworkConfigSet_t& networkConfiguration) { m_networkConfiguration = networkConfiguration; } - RTPS_DllAPI void networkConfiguration( + FASTDDS_EXPORTED_API void networkConfiguration( NetworkConfigSet_t&& networkConfiguration) { m_networkConfiguration = std::move(networkConfiguration); } - RTPS_DllAPI const NetworkConfigSet_t& networkConfiguration() const + FASTDDS_EXPORTED_API const NetworkConfigSet_t& networkConfiguration() const { return m_networkConfiguration; } - RTPS_DllAPI NetworkConfigSet_t& networkConfiguration() + FASTDDS_EXPORTED_API NetworkConfigSet_t& networkConfiguration() { return m_networkConfiguration; } - RTPS_DllAPI bool has_locators() const + FASTDDS_EXPORTED_API bool has_locators() const { return !remote_locators_.unicast.empty() || !remote_locators_.multicast.empty(); } - RTPS_DllAPI const RemoteLocatorList& remote_locators() const + FASTDDS_EXPORTED_API const RemoteLocatorList& remote_locators() const { return remote_locators_; } - RTPS_DllAPI void add_unicast_locator( + FASTDDS_EXPORTED_API void add_unicast_locator( const Locator_t& locator); void set_announced_unicast_locators( @@ -131,7 +131,7 @@ class ReaderProxyData const LocatorList_t& locators, const NetworkFactory& network); - RTPS_DllAPI void add_multicast_locator( + FASTDDS_EXPORTED_API void add_multicast_locator( const Locator_t& locator); void set_multicast_locators( @@ -146,177 +146,177 @@ class ReaderProxyData const NetworkFactory& network, bool use_multicast_locators); - RTPS_DllAPI void key( + FASTDDS_EXPORTED_API void key( const InstanceHandle_t& key) { m_key = key; } - RTPS_DllAPI void key( + FASTDDS_EXPORTED_API void key( InstanceHandle_t&& key) { m_key = std::move(key); } - RTPS_DllAPI InstanceHandle_t key() const + FASTDDS_EXPORTED_API InstanceHandle_t key() const { return m_key; } - RTPS_DllAPI InstanceHandle_t& key() + FASTDDS_EXPORTED_API InstanceHandle_t& key() { return m_key; } - RTPS_DllAPI void RTPSParticipantKey( + FASTDDS_EXPORTED_API void RTPSParticipantKey( const InstanceHandle_t& RTPSParticipantKey) { m_RTPSParticipantKey = RTPSParticipantKey; } - RTPS_DllAPI void RTPSParticipantKey( + FASTDDS_EXPORTED_API void RTPSParticipantKey( InstanceHandle_t&& RTPSParticipantKey) { m_RTPSParticipantKey = std::move(RTPSParticipantKey); } - RTPS_DllAPI InstanceHandle_t RTPSParticipantKey() const + FASTDDS_EXPORTED_API InstanceHandle_t RTPSParticipantKey() const { return m_RTPSParticipantKey; } - RTPS_DllAPI InstanceHandle_t& RTPSParticipantKey() + FASTDDS_EXPORTED_API InstanceHandle_t& RTPSParticipantKey() { return m_RTPSParticipantKey; } - RTPS_DllAPI void typeName( + FASTDDS_EXPORTED_API void typeName( const fastcdr::string_255& typeName) { m_typeName = typeName; } - RTPS_DllAPI void typeName( + FASTDDS_EXPORTED_API void typeName( fastcdr::string_255&& typeName) { m_typeName = std::move(typeName); } - RTPS_DllAPI const fastcdr::string_255& typeName() const + FASTDDS_EXPORTED_API const fastcdr::string_255& typeName() const { return m_typeName; } - RTPS_DllAPI fastcdr::string_255& typeName() + FASTDDS_EXPORTED_API fastcdr::string_255& typeName() { return m_typeName; } - RTPS_DllAPI void topicName( + FASTDDS_EXPORTED_API void topicName( const fastcdr::string_255& topicName) { m_topicName = topicName; } - RTPS_DllAPI void topicName( + FASTDDS_EXPORTED_API void topicName( fastcdr::string_255&& topicName) { m_topicName = std::move(topicName); } - RTPS_DllAPI const fastcdr::string_255& topicName() const + FASTDDS_EXPORTED_API const fastcdr::string_255& topicName() const { return m_topicName; } - RTPS_DllAPI fastcdr::string_255& topicName() + FASTDDS_EXPORTED_API fastcdr::string_255& topicName() { return m_topicName; } - RTPS_DllAPI void userDefinedId( + FASTDDS_EXPORTED_API void userDefinedId( uint16_t userDefinedId) { m_userDefinedId = userDefinedId; } - RTPS_DllAPI uint16_t userDefinedId() const + FASTDDS_EXPORTED_API uint16_t userDefinedId() const { return m_userDefinedId; } - RTPS_DllAPI uint16_t& userDefinedId() + FASTDDS_EXPORTED_API uint16_t& userDefinedId() { return m_userDefinedId; } - RTPS_DllAPI void content_filter( + FASTDDS_EXPORTED_API void content_filter( const fastdds::rtps::ContentFilterProperty& filter) { content_filter_ = filter; } - RTPS_DllAPI void content_filter( + FASTDDS_EXPORTED_API void content_filter( fastdds::rtps::ContentFilterProperty&& filter) { content_filter_ = std::move(filter); } - RTPS_DllAPI const fastdds::rtps::ContentFilterProperty& content_filter() const + FASTDDS_EXPORTED_API const fastdds::rtps::ContentFilterProperty& content_filter() const { return content_filter_; } - RTPS_DllAPI fastdds::rtps::ContentFilterProperty& content_filter() + FASTDDS_EXPORTED_API fastdds::rtps::ContentFilterProperty& content_filter() { return content_filter_; } - RTPS_DllAPI void isAlive( + FASTDDS_EXPORTED_API void isAlive( bool isAlive) { m_isAlive = isAlive; } - RTPS_DllAPI bool isAlive() const + FASTDDS_EXPORTED_API bool isAlive() const { return m_isAlive; } - RTPS_DllAPI bool& isAlive() + FASTDDS_EXPORTED_API bool& isAlive() { return m_isAlive; } - RTPS_DllAPI void topicKind( + FASTDDS_EXPORTED_API void topicKind( TopicKind_t topicKind) { m_topicKind = topicKind; } - RTPS_DllAPI TopicKind_t topicKind() const + FASTDDS_EXPORTED_API TopicKind_t topicKind() const { return m_topicKind; } - RTPS_DllAPI TopicKind_t& topicKind() + FASTDDS_EXPORTED_API TopicKind_t& topicKind() { return m_topicKind; } - RTPS_DllAPI void type_id( + FASTDDS_EXPORTED_API void type_id( const TypeIdV1& other_type_id) { type_id() = other_type_id; } - RTPS_DllAPI const TypeIdV1& type_id() const + FASTDDS_EXPORTED_API const TypeIdV1& type_id() const { assert(m_type_id != nullptr); return *m_type_id; } - RTPS_DllAPI TypeIdV1& type_id() + FASTDDS_EXPORTED_API TypeIdV1& type_id() { if (m_type_id == nullptr) { @@ -325,24 +325,24 @@ class ReaderProxyData return *m_type_id; } - RTPS_DllAPI bool has_type_id() const + FASTDDS_EXPORTED_API bool has_type_id() const { return m_type_id != nullptr; } - RTPS_DllAPI void type( + FASTDDS_EXPORTED_API void type( const TypeObjectV1& other_type) { type() = other_type; } - RTPS_DllAPI const TypeObjectV1& type() const + FASTDDS_EXPORTED_API const TypeObjectV1& type() const { assert(m_type != nullptr); return *m_type; } - RTPS_DllAPI TypeObjectV1& type() + FASTDDS_EXPORTED_API TypeObjectV1& type() { if (m_type == nullptr) { @@ -351,24 +351,24 @@ class ReaderProxyData return *m_type; } - RTPS_DllAPI bool has_type() const + FASTDDS_EXPORTED_API bool has_type() const { return m_type != nullptr; } - RTPS_DllAPI void type_information( + FASTDDS_EXPORTED_API void type_information( const xtypes::TypeInformation& other_type_information) { type_information() = other_type_information; } - RTPS_DllAPI const xtypes::TypeInformation& type_information() const + FASTDDS_EXPORTED_API const xtypes::TypeInformation& type_information() const { assert(m_type_information != nullptr); return *m_type_information; } - RTPS_DllAPI xtypes::TypeInformation& type_information() + FASTDDS_EXPORTED_API xtypes::TypeInformation& type_information() { if (m_type_information == nullptr) { @@ -377,7 +377,7 @@ class ReaderProxyData return *m_type_information; } - RTPS_DllAPI bool has_type_information() const + FASTDDS_EXPORTED_API bool has_type_information() const { return m_type_information != nullptr; } diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.h b/include/fastdds/rtps/builtin/data/WriterProxyData.h index ec8eed91d93..ec13009e2b6 100644 --- a/include/fastdds/rtps/builtin/data/WriterProxyData.h +++ b/include/fastdds/rtps/builtin/data/WriterProxyData.h @@ -49,106 +49,106 @@ class WriterProxyData { public: - RTPS_DllAPI WriterProxyData( + FASTDDS_EXPORTED_API WriterProxyData( const size_t max_unicast_locators, const size_t max_multicast_locators); - RTPS_DllAPI WriterProxyData( + FASTDDS_EXPORTED_API WriterProxyData( const size_t max_unicast_locators, const size_t max_multicast_locators, const VariableLengthDataLimits& data_limits); - virtual RTPS_DllAPI ~WriterProxyData(); + virtual FASTDDS_EXPORTED_API ~WriterProxyData(); - RTPS_DllAPI WriterProxyData( + FASTDDS_EXPORTED_API WriterProxyData( const WriterProxyData& writerInfo); - RTPS_DllAPI WriterProxyData& operator =( + FASTDDS_EXPORTED_API WriterProxyData& operator =( const WriterProxyData& writerInfo); - RTPS_DllAPI void guid( + FASTDDS_EXPORTED_API void guid( const GUID_t& guid) { m_guid = guid; } - RTPS_DllAPI void guid( + FASTDDS_EXPORTED_API void guid( GUID_t&& guid) { m_guid = std::move(guid); } - RTPS_DllAPI const GUID_t& guid() const + FASTDDS_EXPORTED_API const GUID_t& guid() const { return m_guid; } - RTPS_DllAPI GUID_t& guid() + FASTDDS_EXPORTED_API GUID_t& guid() { return m_guid; } - RTPS_DllAPI void networkConfiguration( + FASTDDS_EXPORTED_API void networkConfiguration( const NetworkConfigSet_t& networkConfiguration) { m_networkConfiguration = networkConfiguration; } - RTPS_DllAPI void networkConfiguration( + FASTDDS_EXPORTED_API void networkConfiguration( NetworkConfigSet_t&& networkConfiguration) { m_networkConfiguration = std::move(networkConfiguration); } - RTPS_DllAPI const NetworkConfigSet_t& networkConfiguration() const + FASTDDS_EXPORTED_API const NetworkConfigSet_t& networkConfiguration() const { return m_networkConfiguration; } - RTPS_DllAPI NetworkConfigSet_t& networkConfiguration() + FASTDDS_EXPORTED_API NetworkConfigSet_t& networkConfiguration() { return m_networkConfiguration; } - RTPS_DllAPI void persistence_guid( + FASTDDS_EXPORTED_API void persistence_guid( const GUID_t& guid) { persistence_guid_ = guid; } - RTPS_DllAPI void persistence_guid( + FASTDDS_EXPORTED_API void persistence_guid( GUID_t&& guid) { persistence_guid_ = std::move(guid); } - RTPS_DllAPI GUID_t persistence_guid() const + FASTDDS_EXPORTED_API GUID_t persistence_guid() const { return persistence_guid_; } - RTPS_DllAPI GUID_t& persistence_guid() + FASTDDS_EXPORTED_API GUID_t& persistence_guid() { return persistence_guid_; } - RTPS_DllAPI void set_persistence_entity_id( + FASTDDS_EXPORTED_API void set_persistence_entity_id( const EntityId_t& nid) { persistence_guid_.entityId = persistence_guid_.guidPrefix != c_GuidPrefix_Unknown ? nid : c_EntityId_Unknown; } - RTPS_DllAPI bool has_locators() const + FASTDDS_EXPORTED_API bool has_locators() const { return !remote_locators_.unicast.empty() || !remote_locators_.multicast.empty(); } - RTPS_DllAPI const RemoteLocatorList& remote_locators() const + FASTDDS_EXPORTED_API const RemoteLocatorList& remote_locators() const { return remote_locators_; } - RTPS_DllAPI void add_unicast_locator( + FASTDDS_EXPORTED_API void add_unicast_locator( const Locator_t& locator); void set_announced_unicast_locators( @@ -158,7 +158,7 @@ class WriterProxyData const LocatorList_t& locators, const NetworkFactory& network); - RTPS_DllAPI void add_multicast_locator( + FASTDDS_EXPORTED_API void add_multicast_locator( const Locator_t& locator); void set_multicast_locators( @@ -173,155 +173,155 @@ class WriterProxyData const NetworkFactory& network, bool use_multicast_locators); - RTPS_DllAPI void key( + FASTDDS_EXPORTED_API void key( const InstanceHandle_t& key) { m_key = key; } - RTPS_DllAPI void key( + FASTDDS_EXPORTED_API void key( InstanceHandle_t&& key) { m_key = std::move(key); } - RTPS_DllAPI InstanceHandle_t key() const + FASTDDS_EXPORTED_API InstanceHandle_t key() const { return m_key; } - RTPS_DllAPI InstanceHandle_t& key() + FASTDDS_EXPORTED_API InstanceHandle_t& key() { return m_key; } - RTPS_DllAPI void RTPSParticipantKey( + FASTDDS_EXPORTED_API void RTPSParticipantKey( const InstanceHandle_t& RTPSParticipantKey) { m_RTPSParticipantKey = RTPSParticipantKey; } - RTPS_DllAPI void RTPSParticipantKey( + FASTDDS_EXPORTED_API void RTPSParticipantKey( InstanceHandle_t&& RTPSParticipantKey) { m_RTPSParticipantKey = std::move(RTPSParticipantKey); } - RTPS_DllAPI InstanceHandle_t RTPSParticipantKey() const + FASTDDS_EXPORTED_API InstanceHandle_t RTPSParticipantKey() const { return m_RTPSParticipantKey; } - RTPS_DllAPI InstanceHandle_t& RTPSParticipantKey() + FASTDDS_EXPORTED_API InstanceHandle_t& RTPSParticipantKey() { return m_RTPSParticipantKey; } - RTPS_DllAPI void typeName( + FASTDDS_EXPORTED_API void typeName( const fastcdr::string_255& typeName) { m_typeName = typeName; } - RTPS_DllAPI void typeName( + FASTDDS_EXPORTED_API void typeName( fastcdr::string_255&& typeName) { m_typeName = std::move(typeName); } - RTPS_DllAPI const fastcdr::string_255& typeName() const + FASTDDS_EXPORTED_API const fastcdr::string_255& typeName() const { return m_typeName; } - RTPS_DllAPI fastcdr::string_255& typeName() + FASTDDS_EXPORTED_API fastcdr::string_255& typeName() { return m_typeName; } - RTPS_DllAPI void topicName( + FASTDDS_EXPORTED_API void topicName( const fastcdr::string_255& topicName) { m_topicName = topicName; } - RTPS_DllAPI void topicName( + FASTDDS_EXPORTED_API void topicName( fastcdr::string_255&& topicName) { m_topicName = std::move(topicName); } - RTPS_DllAPI const fastcdr::string_255& topicName() const + FASTDDS_EXPORTED_API const fastcdr::string_255& topicName() const { return m_topicName; } - RTPS_DllAPI fastcdr::string_255& topicName() + FASTDDS_EXPORTED_API fastcdr::string_255& topicName() { return m_topicName; } - RTPS_DllAPI void userDefinedId( + FASTDDS_EXPORTED_API void userDefinedId( uint16_t userDefinedId) { m_userDefinedId = userDefinedId; } - RTPS_DllAPI uint16_t userDefinedId() const + FASTDDS_EXPORTED_API uint16_t userDefinedId() const { return m_userDefinedId; } - RTPS_DllAPI uint16_t& userDefinedId() + FASTDDS_EXPORTED_API uint16_t& userDefinedId() { return m_userDefinedId; } - RTPS_DllAPI void typeMaxSerialized( + FASTDDS_EXPORTED_API void typeMaxSerialized( uint32_t typeMaxSerialized) { m_typeMaxSerialized = typeMaxSerialized; } - RTPS_DllAPI uint32_t typeMaxSerialized() const + FASTDDS_EXPORTED_API uint32_t typeMaxSerialized() const { return m_typeMaxSerialized; } - RTPS_DllAPI uint32_t& typeMaxSerialized() + FASTDDS_EXPORTED_API uint32_t& typeMaxSerialized() { return m_typeMaxSerialized; } - RTPS_DllAPI void topicKind( + FASTDDS_EXPORTED_API void topicKind( TopicKind_t topicKind) { m_topicKind = topicKind; } - RTPS_DllAPI TopicKind_t topicKind() const + FASTDDS_EXPORTED_API TopicKind_t topicKind() const { return m_topicKind; } - RTPS_DllAPI TopicKind_t& topicKind() + FASTDDS_EXPORTED_API TopicKind_t& topicKind() { return m_topicKind; } - RTPS_DllAPI void type_id( + FASTDDS_EXPORTED_API void type_id( const TypeIdV1& other_type_id) { type_id() = other_type_id; } - RTPS_DllAPI const TypeIdV1& type_id() const + FASTDDS_EXPORTED_API const TypeIdV1& type_id() const { assert(m_type_id != nullptr); return *m_type_id; } - RTPS_DllAPI TypeIdV1& type_id() + FASTDDS_EXPORTED_API TypeIdV1& type_id() { if (m_type_id == nullptr) { @@ -330,24 +330,24 @@ class WriterProxyData return *m_type_id; } - RTPS_DllAPI bool has_type_id() const + FASTDDS_EXPORTED_API bool has_type_id() const { return m_type_id != nullptr; } - RTPS_DllAPI void type( + FASTDDS_EXPORTED_API void type( const TypeObjectV1& other_type) { type() = other_type; } - RTPS_DllAPI const TypeObjectV1& type() const + FASTDDS_EXPORTED_API const TypeObjectV1& type() const { assert(m_type != nullptr); return *m_type; } - RTPS_DllAPI TypeObjectV1& type() + FASTDDS_EXPORTED_API TypeObjectV1& type() { if (m_type == nullptr) { @@ -356,24 +356,24 @@ class WriterProxyData return *m_type; } - RTPS_DllAPI bool has_type() const + FASTDDS_EXPORTED_API bool has_type() const { return m_type != nullptr; } - RTPS_DllAPI void type_information( + FASTDDS_EXPORTED_API void type_information( const xtypes::TypeInformation& other_type_information) { type_information() = other_type_information; } - RTPS_DllAPI const xtypes::TypeInformation& type_information() const + FASTDDS_EXPORTED_API const xtypes::TypeInformation& type_information() const { assert(m_type_information != nullptr); return *m_type_information; } - RTPS_DllAPI xtypes::TypeInformation& type_information() + FASTDDS_EXPORTED_API xtypes::TypeInformation& type_information() { if (m_type_information == nullptr) { @@ -382,7 +382,7 @@ class WriterProxyData return *m_type_information; } - RTPS_DllAPI bool has_type_information() const + FASTDDS_EXPORTED_API bool has_type_information() const { return m_type_information != nullptr; } diff --git a/include/fastdds/rtps/common/CDRMessage_t.h b/include/fastdds/rtps/common/CDRMessage_t.h index 567f4e314bd..d5e6e1f934a 100644 --- a/include/fastdds/rtps/common/CDRMessage_t.h +++ b/include/fastdds/rtps/common/CDRMessage_t.h @@ -47,7 +47,7 @@ namespace rtps { * @brief Structure CDRMessage_t, contains a serialized message. * @ingroup COMMON_MODULE */ -struct RTPS_DllAPI CDRMessage_t final +struct FASTDDS_EXPORTED_API CDRMessage_t final { // TODO(Miguel C): Deprecate when not used in mocks CDRMessage_t() diff --git a/include/fastdds/rtps/common/CacheChange.h b/include/fastdds/rtps/common/CacheChange.h index 3c0d30d19f7..cb88c738d38 100644 --- a/include/fastdds/rtps/common/CacheChange.h +++ b/include/fastdds/rtps/common/CacheChange.h @@ -72,7 +72,7 @@ struct CacheChangeReaderInfo_t * Structure CacheChange_t, contains information on a specific CacheChange. * @ingroup COMMON_MODULE */ -struct RTPS_DllAPI CacheChange_t +struct FASTDDS_EXPORTED_API CacheChange_t { //!Kind of change, default value ALIVE. ChangeKind_t kind = ALIVE; diff --git a/include/fastdds/rtps/common/ChangeKind_t.hpp b/include/fastdds/rtps/common/ChangeKind_t.hpp index 5ffbceb385b..69a500eeb04 100644 --- a/include/fastdds/rtps/common/ChangeKind_t.hpp +++ b/include/fastdds/rtps/common/ChangeKind_t.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_ #define _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_ -#include +#include namespace eprosima { namespace fastrtps { @@ -29,7 +29,7 @@ namespace rtps { * @enum ChangeKind_t, different types of CacheChange_t. * @ingroup COMMON_MODULE */ -enum RTPS_DllAPI ChangeKind_t +enum FASTDDS_EXPORTED_API ChangeKind_t { ALIVE, //!< ALIVE NOT_ALIVE_DISPOSED, //!< NOT_ALIVE_DISPOSED diff --git a/include/fastdds/rtps/common/EntityId_t.hpp b/include/fastdds/rtps/common/EntityId_t.hpp index 5a2a5754a68..fbbc675bdde 100644 --- a/include/fastdds/rtps/common/EntityId_t.hpp +++ b/include/fastdds/rtps/common/EntityId_t.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_COMMON_ENTITYID_T_HPP_ #define _FASTDDS_RTPS_COMMON_ENTITYID_T_HPP_ -#include +#include #include #include @@ -73,7 +73,7 @@ namespace rtps { //!@brief Structure EntityId_t, entity id part of GUID_t. //!@ingroup COMMON_MODULE -struct RTPS_DllAPI EntityId_t +struct FASTDDS_EXPORTED_API EntityId_t { static constexpr unsigned int size = 4; octet value[size]; diff --git a/include/fastdds/rtps/common/FragmentNumber.h b/include/fastdds/rtps/common/FragmentNumber.h index a1b5d1dcef0..976b3b990d5 100644 --- a/include/fastdds/rtps/common/FragmentNumber.h +++ b/include/fastdds/rtps/common/FragmentNumber.h @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_ #define _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_ -#include +#include #include #include @@ -27,9 +27,9 @@ #include #include -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ +namespace eprosima { +namespace fastrtps { +namespace rtps { using FragmentNumber_t = uint32_t; @@ -37,19 +37,21 @@ using FragmentNumber_t = uint32_t; //!@ingroup COMMON_MODULE using FragmentNumberSet_t = BitmapRange; -inline std::ostream& operator<<(std::ostream& output, const FragmentNumberSet_t& fns) +inline std::ostream& operator <<( + std::ostream& output, + const FragmentNumberSet_t& fns) { output << fns.base() << ":"; fns.for_each([&](FragmentNumber_t it) - { - output << it << "-"; - }); + { + output << it << "-"; + }); return output; } -} -} -} +} // namespace rtps +} // namespace fastrtps +} // namespace eprosima #endif /* _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_ */ diff --git a/include/fastdds/rtps/common/Guid.h b/include/fastdds/rtps/common/Guid.h index b82caac24bc..985466ae1d3 100644 --- a/include/fastdds/rtps/common/Guid.h +++ b/include/fastdds/rtps/common/Guid.h @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_RTPS_GUID_H_ #define _FASTDDS_RTPS_RTPS_GUID_H_ -#include +#include #include #include #include @@ -36,7 +36,7 @@ struct InstanceHandle_t; //!@brief Structure GUID_t, entity identifier, unique in DDS-RTPS Domain. //!@ingroup COMMON_MODULE -struct RTPS_DllAPI GUID_t +struct FASTDDS_EXPORTED_API GUID_t { //!Guid prefix GuidPrefix_t guidPrefix; diff --git a/include/fastdds/rtps/common/GuidPrefix_t.hpp b/include/fastdds/rtps/common/GuidPrefix_t.hpp index b7a0be73d4e..2174a0c5585 100644 --- a/include/fastdds/rtps/common/GuidPrefix_t.hpp +++ b/include/fastdds/rtps/common/GuidPrefix_t.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_ #define _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_ -#include +#include #include #include @@ -33,7 +33,7 @@ namespace rtps { //!@brief Structure GuidPrefix_t, Guid Prefix of GUID_t. //!@ingroup COMMON_MODULE -struct RTPS_DllAPI GuidPrefix_t +struct FASTDDS_EXPORTED_API GuidPrefix_t { static constexpr unsigned int size = 12; octet value[size]; diff --git a/include/fastdds/rtps/common/InstanceHandle.h b/include/fastdds/rtps/common/InstanceHandle.h index c7dfab81880..0697af118e3 100644 --- a/include/fastdds/rtps/common/InstanceHandle.h +++ b/include/fastdds/rtps/common/InstanceHandle.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -31,7 +31,7 @@ namespace rtps { using KeyHash_t = std::array; -struct RTPS_DllAPI InstanceHandleValue_t +struct FASTDDS_EXPORTED_API InstanceHandleValue_t { /** * Write access indexing operator. @@ -148,7 +148,7 @@ struct RTPS_DllAPI InstanceHandleValue_t * Struct InstanceHandle_t, used to contain the key for WITH_KEY topics. * @ingroup COMMON_MODULE */ -struct RTPS_DllAPI InstanceHandle_t +struct FASTDDS_EXPORTED_API InstanceHandle_t { //!Value InstanceHandleValue_t value; diff --git a/include/fastdds/rtps/common/Locator.h b/include/fastdds/rtps/common/Locator.h index 2251a41b2a4..d3daa712643 100644 --- a/include/fastdds/rtps/common/Locator.h +++ b/include/fastdds/rtps/common/Locator.h @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_ELEM_LOCATOR_H_ #define _FASTDDS_RTPS_ELEM_LOCATOR_H_ -#include +#include #include #include @@ -68,7 +68,7 @@ namespace rtps { * For example, an address + port combination in the case of UDP. * @ingroup COMMON_MODULE */ -class RTPS_DllAPI Locator_t +class FASTDDS_EXPORTED_API Locator_t { public: diff --git a/include/fastdds/rtps/common/LocatorList.hpp b/include/fastdds/rtps/common/LocatorList.hpp index 40af3503443..ce28a0c04fe 100644 --- a/include/fastdds/rtps/common/LocatorList.hpp +++ b/include/fastdds/rtps/common/LocatorList.hpp @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_ #define _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_ -#include +#include #include #include @@ -99,31 +99,31 @@ class LocatorList using value_type = typename std::vector::value_type; /// Constructor - RTPS_DllAPI LocatorList() + FASTDDS_EXPORTED_API LocatorList() { } /// Destructor - RTPS_DllAPI ~LocatorList() + FASTDDS_EXPORTED_API ~LocatorList() { } /// Copy constructor - RTPS_DllAPI LocatorList( + FASTDDS_EXPORTED_API LocatorList( const LocatorList& list) : m_locators(list.m_locators) { } /// Move constructor - RTPS_DllAPI LocatorList( + FASTDDS_EXPORTED_API LocatorList( LocatorList&& list) : m_locators(std::move(list.m_locators)) { } /// Copy assignment - RTPS_DllAPI LocatorList& operator =( + FASTDDS_EXPORTED_API LocatorList& operator =( const LocatorList& list) { m_locators = list.m_locators; @@ -131,7 +131,7 @@ class LocatorList } /// Move assignment - RTPS_DllAPI LocatorList& operator =( + FASTDDS_EXPORTED_API LocatorList& operator =( LocatorList&& list) { m_locators = std::move(list.m_locators); @@ -139,7 +139,7 @@ class LocatorList } /// Equal to operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const LocatorList& locator_list) const { if (locator_list.m_locators.size() == m_locators.size()) @@ -171,7 +171,7 @@ class LocatorList * * @return LocatorListIterator iterator to the first locator. */ - RTPS_DllAPI LocatorListIterator begin() + FASTDDS_EXPORTED_API LocatorListIterator begin() { return m_locators.begin(); } @@ -181,7 +181,7 @@ class LocatorList * * @return LocatorListIterator iterator to the element following the last element. */ - RTPS_DllAPI LocatorListIterator end() + FASTDDS_EXPORTED_API LocatorListIterator end() { return m_locators.end(); } @@ -191,7 +191,7 @@ class LocatorList * * @return LocatorListConstIterator iterator to the first locator. */ - RTPS_DllAPI LocatorListConstIterator begin() const + FASTDDS_EXPORTED_API LocatorListConstIterator begin() const { return m_locators.begin(); } @@ -201,7 +201,7 @@ class LocatorList * * @return LocatorListConstIterator iterator to the element following the last element. */ - RTPS_DllAPI LocatorListConstIterator end() const + FASTDDS_EXPORTED_API LocatorListConstIterator end() const { return m_locators.end(); } @@ -211,7 +211,7 @@ class LocatorList * * @return size_t The number of locators in the container. */ - RTPS_DllAPI size_t size() const + FASTDDS_EXPORTED_API size_t size() const { return m_locators.size(); } @@ -222,7 +222,7 @@ class LocatorList * @param list New content to be saved into the container. * @return LocatorList& reference to the container with the replaced content. */ - RTPS_DllAPI LocatorList& assign( + FASTDDS_EXPORTED_API LocatorList& assign( const LocatorList& list) { if (!(*this == list)) @@ -235,7 +235,7 @@ class LocatorList /** * @brief Erase all locators from the container. */ - RTPS_DllAPI void clear() + FASTDDS_EXPORTED_API void clear() { return m_locators.clear(); } @@ -245,7 +245,7 @@ class LocatorList * * @param num new capacity of the vector, in number of elements. */ - RTPS_DllAPI void reserve( + FASTDDS_EXPORTED_API void reserve( size_t num) { return m_locators.reserve(num); @@ -258,7 +258,7 @@ class LocatorList * * @param num new size of the container. */ - RTPS_DllAPI void resize( + FASTDDS_EXPORTED_API void resize( size_t num) { return m_locators.resize(num); @@ -269,7 +269,7 @@ class LocatorList * * @param loc locator to be appended. */ - RTPS_DllAPI void push_back( + FASTDDS_EXPORTED_API void push_back( const Locator& loc) { bool already = false; @@ -292,7 +292,7 @@ class LocatorList * * @param locList LocatorList with the locators to be appended. */ - RTPS_DllAPI void push_back( + FASTDDS_EXPORTED_API void push_back( const LocatorList& locList) { for (auto it = locList.m_locators.begin(); it != locList.m_locators.end(); ++it) @@ -306,7 +306,7 @@ class LocatorList * * @return true if the container is empty. False otherwise. */ - RTPS_DllAPI bool empty() const + FASTDDS_EXPORTED_API bool empty() const { return m_locators.empty(); } @@ -316,7 +316,7 @@ class LocatorList * * @param loc Locator to be removed. */ - RTPS_DllAPI void erase( + FASTDDS_EXPORTED_API void erase( const Locator& loc) { auto it = std::find(m_locators.begin(), m_locators.end(), loc); @@ -331,7 +331,7 @@ class LocatorList * * @return true if all locators are valid. False otherwise. */ - RTPS_DllAPI bool isValid() const + FASTDDS_EXPORTED_API bool isValid() const { for (LocatorListConstIterator it = this->begin(); it != this->end(); ++it) { @@ -348,7 +348,7 @@ class LocatorList * * @param locatorList container to exchange the contents with. */ - RTPS_DllAPI void swap( + FASTDDS_EXPORTED_API void swap( LocatorList& locatorList) { this->m_locators.swap(locatorList.m_locators); diff --git a/include/fastdds/rtps/common/LocatorWithMask.hpp b/include/fastdds/rtps/common/LocatorWithMask.hpp index cc311c9b7a3..acba981f778 100644 --- a/include/fastdds/rtps/common/LocatorWithMask.hpp +++ b/include/fastdds/rtps/common/LocatorWithMask.hpp @@ -21,8 +21,7 @@ #include -#include - +#include #include namespace eprosima { @@ -32,7 +31,7 @@ namespace rtps { /** * A Locator with a mask that defines the number of significant bits of its address. */ -class RTPS_DllAPI LocatorWithMask : public Locator +class FASTDDS_EXPORTED_API LocatorWithMask : public Locator { public: @@ -70,7 +69,7 @@ class RTPS_DllAPI LocatorWithMask : public Locator uint8_t mask_ = 24; }; -RTPS_DllAPI std::ostream& operator <<( +FASTDDS_EXPORTED_API std::ostream& operator <<( std::ostream& output, const LocatorWithMask& loc); diff --git a/include/fastdds/rtps/common/MatchingInfo.h b/include/fastdds/rtps/common/MatchingInfo.h index f572b44f2b6..50025f870f9 100644 --- a/include/fastdds/rtps/common/MatchingInfo.h +++ b/include/fastdds/rtps/common/MatchingInfo.h @@ -22,9 +22,9 @@ #include -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ +namespace eprosima { +namespace fastrtps { +namespace rtps { /** * @enum MatchingStatus, indicates whether the matched publication/subscription method of the PublisherListener or SubscriberListener has @@ -32,10 +32,12 @@ namespace rtps{ * @ingroup COMMON_MODULE */ #if defined(_WIN32) - enum RTPS_DllAPI MatchingStatus{ +enum FASTDDS_EXPORTED_API MatchingStatus +{ #else - enum MatchingStatus{ -#endif +enum MatchingStatus +{ +#endif // if defined(_WIN32) MATCHED_MATCHING,//!< MATCHED_MATCHING, new publisher/subscriber found REMOVED_MATCHING //!< REMOVED_MATCHING, publisher/subscriber removed @@ -45,24 +47,39 @@ namespace rtps{ * Class MatchingInfo contains information about the matching between two endpoints. * @ingroup COMMON_MODULE */ -class RTPS_DllAPI MatchingInfo +class FASTDDS_EXPORTED_API MatchingInfo { public: + //!Default constructor - MatchingInfo():status(MATCHED_MATCHING){}; + MatchingInfo() + : status(MATCHED_MATCHING) + { + } + /** - * @param stat Status - * @param guid GUID - */ - MatchingInfo(MatchingStatus stat,const GUID_t&guid):status(stat),remoteEndpointGuid(guid){}; - ~MatchingInfo(){}; + * @param stat Status + * @param guid GUID + */ + MatchingInfo( + MatchingStatus stat, + const GUID_t& guid) + : status(stat) + , remoteEndpointGuid(guid) + { + } + + ~MatchingInfo() + { + } + //!Status MatchingStatus status; //!Remote endpoint GUID GUID_t remoteEndpointGuid; }; -} -} -} +} // namespace rtps +} // namespace fastrtps +} // namespace eprosima #endif /* _FASTDDS_RTPS_MATCHINGINFO_H_ */ diff --git a/include/fastdds/rtps/common/SampleIdentity.h b/include/fastdds/rtps/common/SampleIdentity.h index 2eb763cf187..d5657dcb8b5 100644 --- a/include/fastdds/rtps/common/SampleIdentity.h +++ b/include/fastdds/rtps/common/SampleIdentity.h @@ -30,7 +30,7 @@ namespace rtps { * @brief This class is used to specify a sample * @ingroup COMMON_MODULE */ -class RTPS_DllAPI SampleIdentity +class FASTDDS_EXPORTED_API SampleIdentity { public: diff --git a/include/fastdds/rtps/common/SequenceNumber.h b/include/fastdds/rtps/common/SequenceNumber.h index 90f737a1a56..57453fc65d7 100644 --- a/include/fastdds/rtps/common/SequenceNumber.h +++ b/include/fastdds/rtps/common/SequenceNumber.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -35,7 +35,7 @@ namespace rtps { //!@brief Structure SequenceNumber_t, different for each change in the same writer. //!@ingroup COMMON_MODULE -struct RTPS_DllAPI SequenceNumber_t +struct FASTDDS_EXPORTED_API SequenceNumber_t { //! int32_t high = 0; diff --git a/include/fastdds/rtps/common/SerializedPayload.h b/include/fastdds/rtps/common/SerializedPayload.h index 1125b1318b5..5b9d9e69847 100644 --- a/include/fastdds/rtps/common/SerializedPayload.h +++ b/include/fastdds/rtps/common/SerializedPayload.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include /*! @@ -53,7 +53,7 @@ namespace rtps { //!@brief Structure SerializedPayload_t. //!@ingroup COMMON_MODULE -struct RTPS_DllAPI SerializedPayload_t +struct FASTDDS_EXPORTED_API SerializedPayload_t { //!Size in bytes of the representation header as specified in the RTPS 2.3 specification chapter 10. static constexpr size_t representation_header_size = 4u; diff --git a/include/fastdds/rtps/common/Time_t.h b/include/fastdds/rtps/common/Time_t.h index 16f120fb7bb..24e21f36f29 100644 --- a/include/fastdds/rtps/common/Time_t.h +++ b/include/fastdds/rtps/common/Time_t.h @@ -19,7 +19,7 @@ #ifndef _FASTDDS_RTPS_TIME_T_H_ #define _FASTDDS_RTPS_TIME_T_H_ -#include +#include #include #include @@ -32,7 +32,7 @@ namespace fastrtps { * Structure Time_t, used to describe times. * @ingroup COMMON_MODULE */ -struct RTPS_DllAPI Time_t +struct FASTDDS_EXPORTED_API Time_t { static constexpr int32_t INFINITE_SECONDS = 0x7fffffff; static constexpr uint32_t INFINITE_NANOSECONDS = 0xffffffffu; @@ -96,7 +96,7 @@ namespace rtps { * Structure Time_t, used to describe times at RTPS protocol. * @ingroup COMMON_MODULE */ -class RTPS_DllAPI Time_t +class FASTDDS_EXPORTED_API Time_t { public: diff --git a/include/fastdds/rtps/common/Token.h b/include/fastdds/rtps/common/Token.h index c2787378482..3f4bebc7b37 100644 --- a/include/fastdds/rtps/common/Token.h +++ b/include/fastdds/rtps/common/Token.h @@ -18,7 +18,7 @@ #ifndef _FASTDDS_RTPS_COMMON_TOKEN_H_ #define _FASTDDS_RTPS_COMMON_TOKEN_H_ -#include +#include #include #include @@ -28,90 +28,102 @@ namespace rtps { class DataHolder { - public: - - DataHolder() {} - - DataHolder(const DataHolder& data_holder) : - class_id_(data_holder.class_id_), - properties_(data_holder.properties_), - binary_properties_(data_holder.binary_properties_) {} - - DataHolder(DataHolder&& data_holder) : - class_id_(data_holder.class_id_), - properties_(data_holder.properties_), - binary_properties_(data_holder.binary_properties_) {} - - DataHolder& operator=(const DataHolder& data_holder) - { - class_id_ = data_holder.class_id_; - properties_ = data_holder.properties_; - binary_properties_ = data_holder.binary_properties_; - - return *this; - } - - DataHolder& operator=(DataHolder&& data_holder) - { - class_id_ = std::move(data_holder.class_id_); - properties_ = std::move(data_holder.properties_); - binary_properties_ = std::move(data_holder.binary_properties_); - - return *this; - } - - bool is_nil() const - { - return class_id_.empty(); - } - - void class_id(const std::string& class_id) - { - class_id_ = class_id; - } - - void class_id(std::string&& class_id) - { - class_id_ = std::move(class_id); - } - - std::string& class_id() - { - return class_id_; - } - - const std::string& class_id() const - { - return class_id_; - } - - const PropertySeq& properties() const - { - return properties_; - } - - PropertySeq& properties() - { - return properties_; - } - - const BinaryPropertySeq& binary_properties() const - { - return binary_properties_; - } - - BinaryPropertySeq& binary_properties() - { - return binary_properties_; - } - - private: - - std::string class_id_; - - PropertySeq properties_; - - BinaryPropertySeq binary_properties_; +public: + + DataHolder() + { + } + + DataHolder( + const DataHolder& data_holder) + : class_id_(data_holder.class_id_) + , properties_(data_holder.properties_) + , binary_properties_(data_holder.binary_properties_) + { + } + + DataHolder( + DataHolder&& data_holder) + : class_id_(data_holder.class_id_) + , properties_(data_holder.properties_) + , binary_properties_(data_holder.binary_properties_) + { + } + + DataHolder& operator =( + const DataHolder& data_holder) + { + class_id_ = data_holder.class_id_; + properties_ = data_holder.properties_; + binary_properties_ = data_holder.binary_properties_; + + return *this; + } + + DataHolder& operator =( + DataHolder&& data_holder) + { + class_id_ = std::move(data_holder.class_id_); + properties_ = std::move(data_holder.properties_); + binary_properties_ = std::move(data_holder.binary_properties_); + + return *this; + } + + bool is_nil() const + { + return class_id_.empty(); + } + + void class_id( + const std::string& class_id) + { + class_id_ = class_id; + } + + void class_id( + std::string&& class_id) + { + class_id_ = std::move(class_id); + } + + std::string& class_id() + { + return class_id_; + } + + const std::string& class_id() const + { + return class_id_; + } + + const PropertySeq& properties() const + { + return properties_; + } + + PropertySeq& properties() + { + return properties_; + } + + const BinaryPropertySeq& binary_properties() const + { + return binary_properties_; + } + + BinaryPropertySeq& binary_properties() + { + return binary_properties_; + } + +private: + + std::string class_id_; + + PropertySeq properties_; + + BinaryPropertySeq binary_properties_; }; typedef std::vector DataHolderSeq; @@ -124,31 +136,57 @@ typedef Token PermissionsCredentialToken; class DataHolderHelper { - public: +public: - static std::string* find_property_value(DataHolder& data_holder, const std::string& name); + static std::string* find_property_value( + DataHolder& data_holder, + const std::string& name); - static const std::string* find_property_value(const DataHolder& data_holder, const std::string& name); + static const std::string* find_property_value( + const DataHolder& data_holder, + const std::string& name); - static Property* find_property(DataHolder& data_holder, const std::string& name); + static Property* find_property( + DataHolder& data_holder, + const std::string& name); - static const Property* find_property(const DataHolder& data_holder, const std::string& name); + static const Property* find_property( + const DataHolder& data_holder, + const std::string& name); - static std::vector* find_binary_property_value(DataHolder& data_holder, const std::string& name); + static std::vector* find_binary_property_value( + DataHolder& data_holder, + const std::string& name); - static const std::vector* find_binary_property_value(const DataHolder& data_holder, const std::string& name); + static const std::vector* find_binary_property_value( + const DataHolder& data_holder, + const std::string& name); - static BinaryProperty* find_binary_property(DataHolder& data_holder, const std::string& name); + static BinaryProperty* find_binary_property( + DataHolder& data_holder, + const std::string& name); - static const BinaryProperty* find_binary_property(const DataHolder& data_holder, const std::string& name); + static const BinaryProperty* find_binary_property( + const DataHolder& data_holder, + const std::string& name); - static size_t serialized_size(const DataHolder& data_holder, size_t current_alignment = 0); + static size_t serialized_size( + const DataHolder& data_holder, + size_t current_alignment = 0); - static size_t serialized_size(const DataHolderSeq& data_holders, size_t current_alignment = 0); + static size_t serialized_size( + const DataHolderSeq& data_holders, + size_t current_alignment = 0); - private: +private: + + inline static size_t alignment( + size_t current_alignment, + size_t dataSize) + { + return (dataSize - (current_alignment % dataSize)) & (dataSize - 1); + } - inline static size_t alignment(size_t current_alignment, size_t dataSize) { return (dataSize - (current_alignment % dataSize)) & (dataSize-1);} }; } //namespace rtps diff --git a/include/fastdds/rtps/common/Types.h b/include/fastdds/rtps/common/Types.h index 9533687ae4d..2834d1d7446 100644 --- a/include/fastdds/rtps/common/Types.h +++ b/include/fastdds/rtps/common/Types.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -103,7 +103,7 @@ using Count_t = uint32_t; #define BIT(i) (1U << static_cast(i)) //!@brief Structure ProtocolVersion_t, contains the protocol version. -struct RTPS_DllAPI ProtocolVersion_t +struct FASTDDS_EXPORTED_API ProtocolVersion_t { octet m_major; octet m_minor; diff --git a/include/fastdds/rtps/common/WriteParams.h b/include/fastdds/rtps/common/WriteParams.h index be7d2d66ab0..3214da72a48 100644 --- a/include/fastdds/rtps/common/WriteParams.h +++ b/include/fastdds/rtps/common/WriteParams.h @@ -30,7 +30,7 @@ namespace rtps { * * @ingroup COMMON_MODULE */ -class RTPS_DllAPI WriteParams +class FASTDDS_EXPORTED_API WriteParams { public: diff --git a/include/fastdds/rtps/exceptions/Exception.h b/include/fastdds/rtps/exceptions/Exception.h index db0b6ce1716..81eefd68ed7 100644 --- a/include/fastdds/rtps/exceptions/Exception.h +++ b/include/fastdds/rtps/exceptions/Exception.h @@ -15,7 +15,7 @@ #ifndef _FASTDDS_RTPS_EXCEPTIONS_EXCEPTION_H_ #define _FASTDDS_RTPS_EXCEPTIONS_EXCEPTION_H_ -#include +#include #include #include #include @@ -32,77 +32,87 @@ namespace rtps { */ class Exception : public std::exception { - public: - - RTPS_DllAPI Exception(){}; - - /// @brief Default destructor. - virtual RTPS_DllAPI ~Exception() throw(); - - /** - * @brief This function returns the number associated with the system exception. - * @return The number associated with the system exception. - */ - RTPS_DllAPI const int32_t& minor() const; - - /** - * @brief This function sets the number that will be associated with the system exception. - * @param minor The number that will be associated with the system exception. - */ - RTPS_DllAPI void minor(const int32_t &minor); - - /// @brief This function throws the object as exception. - virtual RTPS_DllAPI void raise() const = 0; - - /** - * @brief This function returns the error message. - * @return The error message. - */ - virtual RTPS_DllAPI const char* what() const throw(); - - protected: - - /** - * @brief Default constructor. - */ - RTPS_DllAPI explicit Exception(const char* const& message); - - /** - * @brief Default copy constructor. - * @param ex Exception that will be copied. - */ - RTPS_DllAPI Exception(const Exception &ex); - - /** - * @brief Default move constructor. - * @param ex Exception that will be moved. - */ - RTPS_DllAPI Exception(Exception&& ex); - - /** - * @brief Constructor. - * @param message An error message. This message is copied. - * @param minor The number that will be associated with the system exception. - */ - RTPS_DllAPI explicit Exception(const char* const& message, const int32_t minor); - - /** - * @brief Assigment operation. - * @param ex Exception that will be copied. - */ - RTPS_DllAPI Exception& operator=(const Exception& ex); - - /** - * @brief Assigment operation. - * @param ex Exception that will be moved. - */ - RTPS_DllAPI Exception& operator=(Exception&& ex); - - private: - - std::string message_; - - int32_t minor_; +public: + + FASTDDS_EXPORTED_API Exception() + { + } + + /// @brief Default destructor. + virtual FASTDDS_EXPORTED_API ~Exception() throw(); + + /** + * @brief This function returns the number associated with the system exception. + * @return The number associated with the system exception. + */ + FASTDDS_EXPORTED_API const int32_t& minor() const; + + /** + * @brief This function sets the number that will be associated with the system exception. + * @param minor The number that will be associated with the system exception. + */ + FASTDDS_EXPORTED_API void minor( + const int32_t& minor); + + /// @brief This function throws the object as exception. + virtual FASTDDS_EXPORTED_API void raise() const = 0; + + /** + * @brief This function returns the error message. + * @return The error message. + */ + virtual FASTDDS_EXPORTED_API const char* what() const throw(); + +protected: + + /** + * @brief Default constructor. + */ + FASTDDS_EXPORTED_API explicit Exception( + const char* const& message); + + /** + * @brief Default copy constructor. + * @param ex Exception that will be copied. + */ + FASTDDS_EXPORTED_API Exception( + const Exception& ex); + + /** + * @brief Default move constructor. + * @param ex Exception that will be moved. + */ + FASTDDS_EXPORTED_API Exception( + Exception&& ex); + + /** + * @brief Constructor. + * @param message An error message. This message is copied. + * @param minor The number that will be associated with the system exception. + */ + FASTDDS_EXPORTED_API explicit Exception( + const char* const& message, + const int32_t minor); + + /** + * @brief Assigment operation. + * @param ex Exception that will be copied. + */ + FASTDDS_EXPORTED_API Exception& operator =( + const Exception& ex); + + /** + * @brief Assigment operation. + * @param ex Exception that will be moved. + */ + FASTDDS_EXPORTED_API Exception& operator =( + Exception&& ex); + +private: + + std::string message_; + + int32_t minor_; }; } // namespace rtps diff --git a/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp b/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp index 88ceb6cb2eb..37bd42941c0 100644 --- a/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp +++ b/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp @@ -15,16 +15,16 @@ #ifndef FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERCONSTS_HPP #define FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERCONSTS_HPP -#include +#include namespace eprosima { namespace fastdds { namespace rtps { //! Name of the default flow controller. -extern RTPS_DllAPI const char* const FASTDDS_FLOW_CONTROLLER_DEFAULT; +extern FASTDDS_EXPORTED_API const char* const FASTDDS_FLOW_CONTROLLER_DEFAULT; //! Name of the default flow controller for statistics writers. -extern RTPS_DllAPI const char* const FASTDDS_STATISTICS_FLOW_CONTROLLER_DEFAULT; +extern FASTDDS_EXPORTED_API const char* const FASTDDS_STATISTICS_FLOW_CONTROLLER_DEFAULT; } // namespace rtps } // namespace fastdds diff --git a/include/fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h b/include/fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h index aa51c077026..cc6ddbaa13e 100644 --- a/include/fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h +++ b/include/fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h @@ -15,7 +15,7 @@ #ifndef _FASTDDS_RTPS_THROUGHPUT_CONTROLLER_DESCRIPTOR_H #define _FASTDDS_RTPS_THROUGHPUT_CONTROLLER_DESCRIPTOR_H -#include +#include #include namespace eprosima { @@ -35,8 +35,8 @@ struct ThroughputControllerDescriptor //! Window of time in which no more than 'bytesPerPeriod' bytes are allowed. uint32_t periodMillisecs; - RTPS_DllAPI ThroughputControllerDescriptor(); - RTPS_DllAPI ThroughputControllerDescriptor( + FASTDDS_EXPORTED_API ThroughputControllerDescriptor(); + FASTDDS_EXPORTED_API ThroughputControllerDescriptor( uint32_t size, uint32_t time); diff --git a/include/fastdds/rtps/history/History.h b/include/fastdds/rtps/history/History.h index 58947ada939..a5c46dfc531 100644 --- a/include/fastdds/rtps/history/History.h +++ b/include/fastdds/rtps/history/History.h @@ -20,7 +20,7 @@ #ifndef _FASTDDS_RTPS_HISTORY_H_ #define _FASTDDS_RTPS_HISTORY_H_ -#include +#include #include #include @@ -68,7 +68,7 @@ class History * Check if the history is full * @return true if the History is full. */ - RTPS_DllAPI bool isFull() + FASTDDS_EXPORTED_API bool isFull() { return m_isHistoryFull; } @@ -77,7 +77,7 @@ class History * Get the History size. * @return Size of the history. */ - RTPS_DllAPI size_t getHistorySize() + FASTDDS_EXPORTED_API size_t getHistorySize() { std::lock_guard guard(*mp_mutex); return m_changes.size(); @@ -89,7 +89,7 @@ class History * @param ch Pointer to the CacheChange_t to search for. * @return an iterator if a suitable change is found */ - RTPS_DllAPI const_iterator find_change_nts( + FASTDDS_EXPORTED_API const_iterator find_change_nts( CacheChange_t* ch); /** @@ -99,7 +99,7 @@ class History * @param release defaults to true and hints if the CacheChange_t should return to the pool * @return iterator to the next CacheChange_t or end iterator. */ - RTPS_DllAPI virtual iterator remove_change_nts( + FASTDDS_EXPORTED_API virtual iterator remove_change_nts( const_iterator removal, bool release = true); @@ -111,7 +111,7 @@ class History * @param release defaults to true and hints if the CacheChange_t should return to the pool * @return iterator to the next CacheChange_t or end iterator. */ - RTPS_DllAPI virtual iterator remove_change_nts( + FASTDDS_EXPORTED_API virtual iterator remove_change_nts( const_iterator removal, const std::chrono::time_point& max_blocking_time, bool release = true); @@ -120,14 +120,14 @@ class History * Remove all changes from the History * @return True if everything was correctly removed. */ - RTPS_DllAPI bool remove_all_changes(); + FASTDDS_EXPORTED_API bool remove_all_changes(); /** * Remove a specific change from the history. * @param ch Pointer to the CacheChange_t. * @return True if removed. */ - RTPS_DllAPI bool remove_change( + FASTDDS_EXPORTED_API bool remove_change( CacheChange_t* ch); /** @@ -136,7 +136,7 @@ class History * @param[in] max_blocking_time Maximum time this method has to complete the task. * @return True if removed. */ - RTPS_DllAPI bool remove_change( + FASTDDS_EXPORTED_API bool remove_change( CacheChange_t* ch, const std::chrono::time_point& max_blocking_time); @@ -145,7 +145,7 @@ class History * @param ch Pointer to the CacheChange_t to search for. * @return an iterator if a suitable change is found */ - RTPS_DllAPI const_iterator find_change( + FASTDDS_EXPORTED_API const_iterator find_change( CacheChange_t* ch) { std::lock_guard guard(*mp_mutex); @@ -159,7 +159,7 @@ class History * @param ch_outer Pointer to the CacheChange_t to identify. * @return true if the iterator identifies this change. */ - RTPS_DllAPI virtual bool matches_change( + FASTDDS_EXPORTED_API virtual bool matches_change( const CacheChange_t* ch_inner, CacheChange_t* ch_outer); @@ -169,7 +169,7 @@ class History * @param release defaults to true and hints if the CacheChange_t should return to the pool * @return iterator to the next CacheChange_t or end iterator. */ - RTPS_DllAPI iterator remove_change( + FASTDDS_EXPORTED_API iterator remove_change( const_iterator removal, bool release = true) { @@ -181,12 +181,12 @@ class History * Get the beginning of the changes history iterator. * @return Iterator to the beginning of the vector. */ - RTPS_DllAPI iterator changesBegin() + FASTDDS_EXPORTED_API iterator changesBegin() { return m_changes.begin(); } - RTPS_DllAPI reverse_iterator changesRbegin() + FASTDDS_EXPORTED_API reverse_iterator changesRbegin() { return m_changes.rbegin(); } @@ -195,12 +195,12 @@ class History * Get the end of the changes history iterator. * @return Iterator to the end of the vector. */ - RTPS_DllAPI iterator changesEnd() + FASTDDS_EXPORTED_API iterator changesEnd() { return m_changes.end(); } - RTPS_DllAPI reverse_iterator changesRend() + FASTDDS_EXPORTED_API reverse_iterator changesRend() { return m_changes.rend(); } @@ -210,7 +210,7 @@ class History * @param min_change Pointer to pointer to the minimum change. * @return True if correct. */ - RTPS_DllAPI bool get_min_change( + FASTDDS_EXPORTED_API bool get_min_change( CacheChange_t** min_change); /** @@ -218,14 +218,14 @@ class History * @param max_change Pointer to pointer to the maximum change. * @return True if correct. */ - RTPS_DllAPI bool get_max_change( + FASTDDS_EXPORTED_API bool get_max_change( CacheChange_t** max_change); /** * Get the maximum serialized payload size * @return Maximum serialized payload size */ - RTPS_DllAPI inline uint32_t getTypeMaxSerialized() + FASTDDS_EXPORTED_API inline uint32_t getTypeMaxSerialized() { return m_att.payloadMaxSize; } @@ -234,13 +234,13 @@ class History * Get the mutex * @return Mutex */ - RTPS_DllAPI inline RecursiveTimedMutex* getMutex() const + FASTDDS_EXPORTED_API inline RecursiveTimedMutex* getMutex() const { assert(mp_mutex != nullptr); return mp_mutex; } - RTPS_DllAPI bool get_change( + FASTDDS_EXPORTED_API bool get_change( const SequenceNumber_t& seq, const GUID_t& guid, CacheChange_t** change) const; @@ -273,11 +273,11 @@ class History //!Print the seqNum of the changes in the History (for debuggisi, mng purposes). void print_changes_seqNum2(); - RTPS_DllAPI virtual bool do_reserve_cache( + FASTDDS_EXPORTED_API virtual bool do_reserve_cache( CacheChange_t** change, uint32_t size) = 0; - RTPS_DllAPI virtual void do_release_cache( + FASTDDS_EXPORTED_API virtual void do_release_cache( CacheChange_t* ch) = 0; /** diff --git a/include/fastdds/rtps/history/ReaderHistory.h b/include/fastdds/rtps/history/ReaderHistory.h index 0625915264f..7ec05496277 100644 --- a/include/fastdds/rtps/history/ReaderHistory.h +++ b/include/fastdds/rtps/history/ReaderHistory.h @@ -49,9 +49,9 @@ class ReaderHistory : public History /** * Constructor of the ReaderHistory. It needs a HistoryAttributes. */ - RTPS_DllAPI ReaderHistory( + FASTDDS_EXPORTED_API ReaderHistory( const HistoryAttributes& att); - RTPS_DllAPI ~ReaderHistory() override; + FASTDDS_EXPORTED_API ~ReaderHistory() override; /** * Check if a new change can be added to this history. @@ -67,7 +67,7 @@ class ReaderHistory : public History * * @return Whether a call to received_change will succeed when called with the same arguments. */ - RTPS_DllAPI virtual bool can_change_be_added_nts( + FASTDDS_EXPORTED_API virtual bool can_change_be_added_nts( const GUID_t& writer_guid, uint32_t total_payload_size, size_t unknown_missing_changes_up_to, @@ -82,7 +82,7 @@ class ReaderHistory : public History * could potentially be received in the future. * @return True if added. */ - RTPS_DllAPI virtual bool received_change( + FASTDDS_EXPORTED_API virtual bool received_change( CacheChange_t* change, size_t unknown_missing_changes_up_to); @@ -96,7 +96,7 @@ class ReaderHistory : public History * @param[out] rejection_reason In case of been rejected the sample, it will contain the reason of the rejection. * @return True if added. */ - RTPS_DllAPI virtual bool received_change( + FASTDDS_EXPORTED_API virtual bool received_change( CacheChange_t* change, size_t unknown_missing_changes_up_to, fastdds::dds::SampleRejectedStatusKind& rejection_reason) @@ -111,7 +111,7 @@ class ReaderHistory : public History * @param[in] change The received change * @return */ - RTPS_DllAPI bool virtual completed_change( + FASTDDS_EXPORTED_API bool virtual completed_change( rtps::CacheChange_t* change) { (void)change; @@ -126,7 +126,7 @@ class ReaderHistory : public History * @param[out] rejection_reason In case of been rejected the sample, it will contain the reason of the rejection. * @return */ - RTPS_DllAPI virtual bool completed_change( + FASTDDS_EXPORTED_API virtual bool completed_change( CacheChange_t* change, size_t unknown_missing_changes_up_to, fastdds::dds::SampleRejectedStatusKind& rejection_reason) @@ -142,7 +142,7 @@ class ReaderHistory : public History * @param a_change Pointer to the CacheChange to add. * @return True if added. */ - RTPS_DllAPI bool add_change( + FASTDDS_EXPORTED_API bool add_change( CacheChange_t* a_change); /** @@ -152,7 +152,7 @@ class ReaderHistory : public History * @param release specifies if the change must be returned to the pool * @return iterator to the next change if any */ - RTPS_DllAPI iterator remove_change_nts( + FASTDDS_EXPORTED_API iterator remove_change_nts( const_iterator removal, bool release = true) override; @@ -164,7 +164,7 @@ class ReaderHistory : public History * @param release specifies if the change must be returned to the pool * @return iterator to the next change if any */ - RTPS_DllAPI iterator remove_change_nts( + FASTDDS_EXPORTED_API iterator remove_change_nts( const_iterator removal, const std::chrono::time_point& max_blocking_time, bool release = true) override; @@ -175,7 +175,7 @@ class ReaderHistory : public History * @param outer change for comparison * @return true if inner matches outer criteria */ - RTPS_DllAPI bool matches_change( + FASTDDS_EXPORTED_API bool matches_change( const CacheChange_t* inner, CacheChange_t* outer) override; @@ -187,7 +187,7 @@ class ReaderHistory : public History * @param a_guid Pointer to the target guid to search for. * @return True if successful, even if no changes have been removed. * */ - RTPS_DllAPI bool remove_changes_with_guid( + FASTDDS_EXPORTED_API bool remove_changes_with_guid( const GUID_t& a_guid); /** @@ -200,7 +200,7 @@ class ReaderHistory : public History const SequenceNumber_t& seq_num, const GUID_t& writer_guid); - RTPS_DllAPI bool get_min_change_from( + FASTDDS_EXPORTED_API bool get_min_change_from( CacheChange_t** min_change, const GUID_t& writerGuid); @@ -213,7 +213,7 @@ class ReaderHistory : public History * @param writer_guid GUID of the writer being unmatched. * @param last_notified_seq Last sequence number from the specified writer that was notified to the user. */ - RTPS_DllAPI virtual void writer_unmatched( + FASTDDS_EXPORTED_API virtual void writer_unmatched( const GUID_t& writer_guid, const SequenceNumber_t& last_notified_seq); @@ -223,7 +223,7 @@ class ReaderHistory : public History * @param[in] writer_guid Guid of the writer which changes its ownership strength. * @param[out] ownership_strength New value of the writer's Ownership strength. */ - RTPS_DllAPI virtual void writer_update_its_ownership_strength_nts( + FASTDDS_EXPORTED_API virtual void writer_update_its_ownership_strength_nts( const GUID_t& writer_guid, const uint32_t ownership_strength) { @@ -233,11 +233,11 @@ class ReaderHistory : public History protected: - RTPS_DllAPI bool do_reserve_cache( + FASTDDS_EXPORTED_API bool do_reserve_cache( CacheChange_t** change, uint32_t size) override; - RTPS_DllAPI void do_release_cache( + FASTDDS_EXPORTED_API void do_release_cache( CacheChange_t* ch) override; template diff --git a/include/fastdds/rtps/history/WriterHistory.h b/include/fastdds/rtps/history/WriterHistory.h index 74423a7f05b..031035fe255 100644 --- a/include/fastdds/rtps/history/WriterHistory.h +++ b/include/fastdds/rtps/history/WriterHistory.h @@ -50,16 +50,16 @@ class WriterHistory : public rtps::History /** * Constructor of the WriterHistory. */ - RTPS_DllAPI WriterHistory( + FASTDDS_EXPORTED_API WriterHistory( const HistoryAttributes& att); - RTPS_DllAPI virtual ~WriterHistory() override; + FASTDDS_EXPORTED_API virtual ~WriterHistory() override; /** * Add a CacheChange_t to the WriterHistory. * @param a_change Pointer to the CacheChange_t to be added. * @return True if added. */ - RTPS_DllAPI bool add_change( + FASTDDS_EXPORTED_API bool add_change( CacheChange_t* a_change); /** @@ -68,7 +68,7 @@ class WriterHistory : public rtps::History * @param wparams Extra write parameters. * @return True if added. */ - RTPS_DllAPI bool add_change( + FASTDDS_EXPORTED_API bool add_change( CacheChange_t* a_change, WriteParams& wparams); @@ -79,7 +79,7 @@ class WriterHistory : public rtps::History * @param release specifies if the change should be return to the pool * @return iterator to the next change if any */ - RTPS_DllAPI iterator remove_change_nts( + FASTDDS_EXPORTED_API iterator remove_change_nts( const_iterator removal, bool release = true) override; @@ -91,7 +91,7 @@ class WriterHistory : public rtps::History * @param[in] max_blocking_time Maximum time this method has to complete the task. * @return iterator to the next change if any */ - RTPS_DllAPI iterator remove_change_nts( + FASTDDS_EXPORTED_API iterator remove_change_nts( const_iterator removal, const std::chrono::time_point& max_blocking_time, bool release = true) override; @@ -102,52 +102,52 @@ class WriterHistory : public rtps::History * @param outer change for comparison * @return true if inner matches outer criteria */ - RTPS_DllAPI bool matches_change( + FASTDDS_EXPORTED_API bool matches_change( const CacheChange_t* inner, CacheChange_t* outer) override; //! Introduce base class method into scope using History::remove_change; - RTPS_DllAPI virtual bool remove_change_g( + FASTDDS_EXPORTED_API virtual bool remove_change_g( CacheChange_t* a_change); - RTPS_DllAPI virtual bool remove_change_g( + FASTDDS_EXPORTED_API virtual bool remove_change_g( CacheChange_t* a_change, const std::chrono::time_point& max_blocking_time); - RTPS_DllAPI bool remove_change( + FASTDDS_EXPORTED_API bool remove_change( const SequenceNumber_t& sequence_number); - RTPS_DllAPI CacheChange_t* remove_change_and_reuse( + FASTDDS_EXPORTED_API CacheChange_t* remove_change_and_reuse( const SequenceNumber_t& sequence_number); /** * Remove the CacheChange_t with the minimum sequenceNumber. * @return True if correctly removed. */ - RTPS_DllAPI bool remove_min_change(); + FASTDDS_EXPORTED_API bool remove_min_change(); /** * Remove the CacheChange_t with the minimum sequenceNumber. * @param[in] max_blocking_time Maximum time this method has to complete the task. * @return True if correctly removed. */ - RTPS_DllAPI bool remove_min_change( + FASTDDS_EXPORTED_API bool remove_min_change( const std::chrono::time_point& max_blocking_time); - RTPS_DllAPI SequenceNumber_t next_sequence_number() const + FASTDDS_EXPORTED_API SequenceNumber_t next_sequence_number() const { return m_lastCacheChangeSeqNum + 1; } protected: - RTPS_DllAPI bool do_reserve_cache( + FASTDDS_EXPORTED_API bool do_reserve_cache( CacheChange_t** change, uint32_t size) override; - RTPS_DllAPI void do_release_cache( + FASTDDS_EXPORTED_API void do_release_cache( CacheChange_t* ch) override; /** diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h index ef0acb9752e..0e91d7f1388 100644 --- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h +++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h @@ -20,7 +20,7 @@ #ifndef _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ #define _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ -#include +#include #include namespace eprosima { @@ -36,7 +36,7 @@ struct ParticipantDiscoveryInfo //!Enum DISCOVERY_STATUS, four different status for discovered participants. //!@ingroup RTPS_MODULE #if defined(_WIN32) - enum RTPS_DllAPI DISCOVERY_STATUS + enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else enum DISCOVERY_STATUS #endif // if defined(_WIN32) @@ -74,7 +74,7 @@ struct ParticipantDiscoveryInfo #if HAVE_SECURITY struct ParticipantAuthenticationInfo { - enum RTPS_DllAPI AUTHENTICATION_STATUS + enum FASTDDS_EXPORTED_API AUTHENTICATION_STATUS { AUTHORIZED_PARTICIPANT, UNAUTHORIZED_PARTICIPANT diff --git a/include/fastdds/rtps/participant/RTPSParticipant.h b/include/fastdds/rtps/participant/RTPSParticipant.h index a4183117c33..36ff10d496c 100644 --- a/include/fastdds/rtps/participant/RTPSParticipant.h +++ b/include/fastdds/rtps/participant/RTPSParticipant.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace eprosima { @@ -81,7 +81,7 @@ class WLP; * @brief Class RTPSParticipant, contains the public API for a RTPSParticipant. * @ingroup RTPS_MODULE */ -class RTPS_DllAPI RTPSParticipant +class FASTDDS_EXPORTED_API RTPSParticipant { friend class RTPSParticipantImpl; friend class RTPSDomain; diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.h b/include/fastdds/rtps/participant/RTPSParticipantListener.h index 86ac3918cb9..9602d487124 100644 --- a/include/fastdds/rtps/participant/RTPSParticipantListener.h +++ b/include/fastdds/rtps/participant/RTPSParticipantListener.h @@ -38,7 +38,7 @@ class RTPSParticipant; * Class RTPSParticipantListener with virtual method that the user can overload to respond to certain events. * @ingroup RTPS_MODULE */ -class RTPS_DllAPI RTPSParticipantListener +class FASTDDS_EXPORTED_API RTPSParticipantListener { public: diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.h index 083fd6114cd..ce67b6282dc 100644 --- a/include/fastdds/rtps/reader/RTPSReader.h +++ b/include/fastdds/rtps/reader/RTPSReader.h @@ -99,7 +99,7 @@ class RTPSReader * @param wdata Attributes of the writer to add. * @return True if correctly added. */ - RTPS_DllAPI virtual bool matched_writer_add( + FASTDDS_EXPORTED_API virtual bool matched_writer_add( const WriterProxyData& wdata) = 0; /** @@ -108,7 +108,7 @@ class RTPSReader * @param removed_by_lease Whether the writer is being unmatched due to a participant drop. * @return True if correctly removed. */ - RTPS_DllAPI virtual bool matched_writer_remove( + FASTDDS_EXPORTED_API virtual bool matched_writer_remove( const GUID_t& writer_guid, bool removed_by_lease = false) = 0; @@ -117,7 +117,7 @@ class RTPSReader * @param writer_guid GUID of the writer to check. * @return True if it is matched. */ - RTPS_DllAPI virtual bool matched_writer_is_matched( + FASTDDS_EXPORTED_API virtual bool matched_writer_is_matched( const GUID_t& writer_guid) = 0; /** @@ -126,7 +126,7 @@ class RTPSReader * @param change Pointer to the CacheChange_t. * @return true if the reader accepts messages from the. */ - RTPS_DllAPI virtual bool processDataMsg( + FASTDDS_EXPORTED_API virtual bool processDataMsg( CacheChange_t* change) = 0; /** @@ -138,7 +138,7 @@ class RTPSReader * @param fragmentsInSubmessage Number of fragments on this particular message. * @return true if the reader accepts message. */ - RTPS_DllAPI virtual bool processDataFragMsg( + FASTDDS_EXPORTED_API virtual bool processDataFragMsg( CacheChange_t* change, uint32_t sampleSize, uint32_t fragmentStartingNum, @@ -155,7 +155,7 @@ class RTPSReader * @param origin_vendor_id * @return true if the reader accepts messages from the. */ - RTPS_DllAPI virtual bool processHeartbeatMsg( + FASTDDS_EXPORTED_API virtual bool processHeartbeatMsg( const GUID_t& writerGUID, uint32_t hbCount, const SequenceNumber_t& firstSN, @@ -172,7 +172,7 @@ class RTPSReader * @param origin_vendor_id * @return true if the reader accepts messages from the. */ - RTPS_DllAPI virtual bool processGapMsg( + FASTDDS_EXPORTED_API virtual bool processGapMsg( const GUID_t& writerGUID, const SequenceNumber_t& gapStart, const SequenceNumberSet_t& gapList, @@ -184,7 +184,7 @@ class RTPSReader * @param prox Pointer to the WriterProxy. * @return True if correctly removed. */ - RTPS_DllAPI virtual bool change_removed_by_history( + FASTDDS_EXPORTED_API virtual bool change_removed_by_history( CacheChange_t* change, WriterProxy* prox = nullptr) = 0; @@ -192,7 +192,7 @@ class RTPSReader * Get the associated listener, secondary attached Listener in case it is of compound type * @return Pointer to the associated reader listener. */ - RTPS_DllAPI ReaderListener* getListener() const; + FASTDDS_EXPORTED_API ReaderListener* getListener() const; /** * Switch the ReaderListener kind for the Reader. @@ -202,7 +202,7 @@ class RTPSReader * @param target Pointed to ReaderLister to attach * @return True is correctly set. */ - RTPS_DllAPI bool setListener( + FASTDDS_EXPORTED_API bool setListener( ReaderListener* target); /** @@ -211,14 +211,14 @@ class RTPSReader * @param dataCdrSerializedSize Size of the Cache. * @return True if correctly reserved. */ - RTPS_DllAPI bool reserveCache( + FASTDDS_EXPORTED_API bool reserveCache( CacheChange_t** change, uint32_t dataCdrSerializedSize); /** * Release a cacheChange. */ - RTPS_DllAPI void releaseCache( + FASTDDS_EXPORTED_API void releaseCache( CacheChange_t* change); /** @@ -227,7 +227,7 @@ class RTPSReader * @param wp Pointer to pointer to the WriterProxy * @return True if read. */ - RTPS_DllAPI virtual bool nextUnreadCache( + FASTDDS_EXPORTED_API virtual bool nextUnreadCache( CacheChange_t** change, WriterProxy** wp) = 0; @@ -237,34 +237,34 @@ class RTPSReader * @param wp Pointer to pointer to the WriterProxy. * @return True if read. */ - RTPS_DllAPI virtual bool nextUntakenCache( + FASTDDS_EXPORTED_API virtual bool nextUntakenCache( CacheChange_t** change, WriterProxy** wp) = 0; - RTPS_DllAPI bool wait_for_unread_cache( + FASTDDS_EXPORTED_API bool wait_for_unread_cache( const eprosima::fastrtps::Duration_t& timeout); - RTPS_DllAPI uint64_t get_unread_count() const; + FASTDDS_EXPORTED_API uint64_t get_unread_count() const; - RTPS_DllAPI uint64_t get_unread_count( + FASTDDS_EXPORTED_API uint64_t get_unread_count( bool mark_as_read); /** * @return True if the reader expects Inline QOS. */ - RTPS_DllAPI inline bool expectsInlineQos() + FASTDDS_EXPORTED_API inline bool expectsInlineQos() { return m_expectsInlineQos; } //! Returns a pointer to the associated History. - RTPS_DllAPI inline ReaderHistory* getHistory() + FASTDDS_EXPORTED_API inline ReaderHistory* getHistory() { return mp_history; } //! @return The content filter associated to this reader. - RTPS_DllAPI eprosima::fastdds::rtps::IReaderDataFilter* get_content_filter() const + FASTDDS_EXPORTED_API eprosima::fastdds::rtps::IReaderDataFilter* get_content_filter() const { std::lock_guard guard(mp_mutex); return data_filter_; @@ -272,7 +272,7 @@ class RTPSReader //! Set the content filter associated to this reader. //! @param filter Pointer to the content filter to associate to this reader. - RTPS_DllAPI void set_content_filter( + FASTDDS_EXPORTED_API void set_content_filter( eprosima::fastdds::rtps::IReaderDataFilter* filter) { std::lock_guard guard(mp_mutex); @@ -357,7 +357,7 @@ class RTPSReader * * @return true if the sample is valid */ - RTPS_DllAPI bool is_sample_valid( + FASTDDS_EXPORTED_API bool is_sample_valid( const void* data, const GUID_t& writer, const SequenceNumber_t& sn) const; @@ -374,7 +374,7 @@ class RTPSReader * @param listener * @return true if successfully added */ - RTPS_DllAPI bool add_statistics_listener( + FASTDDS_EXPORTED_API bool add_statistics_listener( std::shared_ptr listener); /** @@ -382,7 +382,7 @@ class RTPSReader * @param listener * @return true if successfully removed */ - RTPS_DllAPI bool remove_statistics_listener( + FASTDDS_EXPORTED_API bool remove_statistics_listener( std::shared_ptr listener); /** @@ -390,7 +390,7 @@ class RTPSReader * * @param enabled_writers The new mask to set */ - RTPS_DllAPI void set_enabled_statistics_writers_mask( + FASTDDS_EXPORTED_API void set_enabled_statistics_writers_mask( uint32_t enabled_writers); /** @@ -399,7 +399,7 @@ class RTPSReader * @param [out] connection_list of the reader * @return True if could be retrieved */ - RTPS_DllAPI virtual bool get_connections( + FASTDDS_EXPORTED_API virtual bool get_connections( fastdds::statistics::rtps::ConnectionList& connection_list) = 0; #endif // FASTDDS_STATISTICS diff --git a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h index b71fd8c217b..6fc5f52d359 100644 --- a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h +++ b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h @@ -20,7 +20,7 @@ #ifndef _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__ #define _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__ -#include +#include #include namespace eprosima { @@ -38,7 +38,7 @@ struct ReaderDiscoveryInfo //!Enum DISCOVERY_STATUS, four different status for discovered readers. //!@ingroup RTPS_MODULE #if defined(_WIN32) - enum RTPS_DllAPI DISCOVERY_STATUS + enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else enum DISCOVERY_STATUS #endif // if defined(_WIN32) diff --git a/include/fastdds/rtps/reader/ReaderListener.h b/include/fastdds/rtps/reader/ReaderListener.h index 5ebf826e62d..d579f93f78f 100644 --- a/include/fastdds/rtps/reader/ReaderListener.h +++ b/include/fastdds/rtps/reader/ReaderListener.h @@ -40,7 +40,7 @@ struct CacheChange_t; * certain events. * @ingroup READER_MODULE */ -class RTPS_DllAPI ReaderListener +class FASTDDS_EXPORTED_API ReaderListener { public: diff --git a/include/fastdds/rtps/security/exceptions/SecurityException.h b/include/fastdds/rtps/security/exceptions/SecurityException.h index e638f1d2174..0838f4035fd 100644 --- a/include/fastdds/rtps/security/exceptions/SecurityException.h +++ b/include/fastdds/rtps/security/exceptions/SecurityException.h @@ -31,45 +31,55 @@ namespace security { */ class SecurityException : public Exception { - public: +public: - RTPS_DllAPI SecurityException() {} + FASTDDS_EXPORTED_API SecurityException() + { + } - /** - * @brief Default constructor. - * @param message An error message. This message is copied. - */ - RTPS_DllAPI SecurityException(const std::string& message) : Exception(message.c_str(), 1) {} + /** + * @brief Default constructor. + * @param message An error message. This message is copied. + */ + FASTDDS_EXPORTED_API SecurityException( + const std::string& message) + : Exception(message.c_str(), 1) + { + } - /** - * @brief Default copy constructor. - * @param ex SecurityException that will be copied. - */ - RTPS_DllAPI SecurityException(const SecurityException &ex); + /** + * @brief Default copy constructor. + * @param ex SecurityException that will be copied. + */ + FASTDDS_EXPORTED_API SecurityException( + const SecurityException& ex); - /** - * @brief Default move constructor. - * @param ex SecurityException that will be moved. - */ - RTPS_DllAPI SecurityException(SecurityException&& ex); + /** + * @brief Default move constructor. + * @param ex SecurityException that will be moved. + */ + FASTDDS_EXPORTED_API SecurityException( + SecurityException&& ex); - /** - * @brief Assigment operation. - * @param ex SecurityException that will be copied. - */ - RTPS_DllAPI SecurityException& operator=(const SecurityException &ex); + /** + * @brief Assigment operation. + * @param ex SecurityException that will be copied. + */ + FASTDDS_EXPORTED_API SecurityException& operator =( + const SecurityException& ex); - /** - * @brief Assigment operation. - * @param ex SecurityException that will be moved. - */ - RTPS_DllAPI SecurityException& operator=(SecurityException&& ex); + /** + * @brief Assigment operation. + * @param ex SecurityException that will be moved. + */ + FASTDDS_EXPORTED_API SecurityException& operator =( + SecurityException&& ex); - /// \brief Default constructor - virtual RTPS_DllAPI ~SecurityException() throw(); + /// \brief Default constructor + virtual FASTDDS_EXPORTED_API ~SecurityException() throw(); - /// \brief This function throws the object as an exception. - virtual RTPS_DllAPI void raise() const; + /// \brief This function throws the object as an exception. + virtual FASTDDS_EXPORTED_API void raise() const; }; } // namespace security } // namespace rtps diff --git a/include/fastdds/rtps/transport/ChainingTransport.h b/include/fastdds/rtps/transport/ChainingTransport.h index da3094ab958..364718c5499 100644 --- a/include/fastdds/rtps/transport/ChainingTransport.h +++ b/include/fastdds/rtps/transport/ChainingTransport.h @@ -56,7 +56,7 @@ class ChainingTransport : public TransportInterface public: //! Constructor - RTPS_DllAPI ChainingTransport( + FASTDDS_EXPORTED_API ChainingTransport( const ChainingTransportDescriptor& t) : TransportInterface(0) , low_level_transport_(t.low_level_descriptor->create_transport()) @@ -65,7 +65,7 @@ class ChainingTransport : public TransportInterface } //! Destructor - RTPS_DllAPI virtual ~ChainingTransport() = default; + FASTDDS_EXPORTED_API virtual ~ChainingTransport() = default; /*! * Initialize the low-level transport. This method will prepare all the internals of the transport. @@ -73,7 +73,7 @@ class ChainingTransport : public TransportInterface * @param max_msg_size_no_frag Optional maximum message size to avoid 65500 KB fragmentation limit. * @return True when the transport was correctly initialized. */ - RTPS_DllAPI bool init( + FASTDDS_EXPORTED_API bool init( const fastrtps::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override { @@ -85,7 +85,7 @@ class ChainingTransport : public TransportInterface * Must report whether the input channel associated to this locator is open. Channels must either be * fully closed or fully open, so that "open" and "close" operations are whole and definitive. */ - RTPS_DllAPI bool IsInputChannelOpen( + FASTDDS_EXPORTED_API bool IsInputChannelOpen( const fastrtps::rtps::Locator_t& loc) const override { return low_level_transport_->IsInputChannelOpen(loc); @@ -95,7 +95,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `IsLocatorSupported()`. * Must report whether the given locator is supported by this transport (typically inspecting its "kind" value). */ - RTPS_DllAPI bool IsLocatorSupported( + FASTDDS_EXPORTED_API bool IsLocatorSupported( const fastrtps::rtps::Locator_t& loc) const override { return low_level_transport_->IsLocatorSupported(loc); @@ -105,7 +105,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `RemoteToMainLocal()`. * Returns the locator describing the main (most general) channel that can write to the provided remote locator. */ - RTPS_DllAPI fastrtps::rtps::Locator_t RemoteToMainLocal( + FASTDDS_EXPORTED_API fastrtps::rtps::Locator_t RemoteToMainLocal( const fastrtps::rtps::Locator_t& loc) const override { return low_level_transport_->RemoteToMainLocal(loc); @@ -116,7 +116,7 @@ class ChainingTransport : public TransportInterface * Opens an input channel to receive incoming connections. * If there is an existing channel it registers the receiver interface. */ - RTPS_DllAPI bool OpenInputChannel( + FASTDDS_EXPORTED_API bool OpenInputChannel( const fastrtps::rtps::Locator_t& loc, TransportReceiverInterface* receiver_interface, uint32_t max_message_size) override; @@ -126,7 +126,7 @@ class ChainingTransport : public TransportInterface * Must open the channel that maps to/from the given locator. This method must allocate, reserve and mark * any resources that are needed for said channel. */ - RTPS_DllAPI bool OpenOutputChannel( + FASTDDS_EXPORTED_API bool OpenOutputChannel( SendResourceList& sender_resource_list, const fastrtps::rtps::Locator_t& loc) override; @@ -136,7 +136,7 @@ class ChainingTransport : public TransportInterface * IMPORTANT: It MUST be safe to call this method even during a Receive operation on another thread. You must implement * any necessary mutual exclusion and timeout mechanisms to make sure the channel can be closed without damage. */ - RTPS_DllAPI bool CloseInputChannel( + FASTDDS_EXPORTED_API bool CloseInputChannel( const fastrtps::rtps::Locator_t& loc) override { return low_level_transport_->CloseInputChannel(loc); @@ -146,7 +146,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `NormalizeLocator()`. * Performs locator normalization (assign valid IP if not defined by user) */ - RTPS_DllAPI fastrtps::rtps::LocatorList_t NormalizeLocator( + FASTDDS_EXPORTED_API fastrtps::rtps::LocatorList_t NormalizeLocator( const fastrtps::rtps::Locator_t& locator) override { return low_level_transport_->NormalizeLocator(locator); @@ -156,7 +156,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `is_local_locator()`. * Must report whether the given locator is from the local host */ - RTPS_DllAPI bool is_local_locator( + FASTDDS_EXPORTED_API bool is_local_locator( const fastrtps::rtps::Locator_t& locator) const override { return low_level_transport_->is_local_locator(locator); @@ -166,7 +166,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `is_localhost_allowed()`. * Must report whether localhost locator is allowed */ - RTPS_DllAPI bool is_localhost_allowed() const override + FASTDDS_EXPORTED_API bool is_localhost_allowed() const override { return low_level_transport_->is_localhost_allowed(); } @@ -175,7 +175,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `netmask_filter_info()`. * Returns netmask filter information (transport's netmask filter kind and allowlist) */ - RTPS_DllAPI NetmaskFilterInfo netmask_filter_info() const override + FASTDDS_EXPORTED_API NetmaskFilterInfo netmask_filter_info() const override { return low_level_transport_->netmask_filter_info(); } @@ -184,7 +184,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `DoInputLocatorsMatch()`. * Must report whether two locators map to the same internal channel. */ - RTPS_DllAPI bool DoInputLocatorsMatch( + FASTDDS_EXPORTED_API bool DoInputLocatorsMatch( const fastrtps::rtps::Locator_t& locator_1, const fastrtps::rtps::Locator_t& locator_2) const override { @@ -195,7 +195,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `select_locators()`. * Performs the locator selection algorithm for this transport. */ - RTPS_DllAPI void select_locators( + FASTDDS_EXPORTED_API void select_locators( fastrtps::rtps::LocatorSelector& selector) const override { return low_level_transport_->select_locators(selector); @@ -205,7 +205,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `AddDefaultOutputLocator()`. * Add default output locator to the locator list */ - RTPS_DllAPI void AddDefaultOutputLocator( + FASTDDS_EXPORTED_API void AddDefaultOutputLocator( fastrtps::rtps::LocatorList_t& defaultList) override { return low_level_transport_->AddDefaultOutputLocator(defaultList); @@ -215,7 +215,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `getDefaultMetatrafficMulticastLocators()`. * Add metatraffic multicast locator with the given port */ - RTPS_DllAPI bool getDefaultMetatrafficMulticastLocators( + FASTDDS_EXPORTED_API bool getDefaultMetatrafficMulticastLocators( fastrtps::rtps::LocatorList_t& locators, uint32_t metatraffic_multicast_port) const override { @@ -226,7 +226,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `getDefaultMetatrafficUnicastLocators()`. * Add metatraffic unicast locator with the given port */ - RTPS_DllAPI bool getDefaultMetatrafficUnicastLocators( + FASTDDS_EXPORTED_API bool getDefaultMetatrafficUnicastLocators( fastrtps::rtps::LocatorList_t& locators, uint32_t metatraffic_unicast_port) const override { @@ -237,7 +237,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `getDefaultUnicastLocators()`. * Add unicast locator with the given port */ - RTPS_DllAPI bool getDefaultUnicastLocators( + FASTDDS_EXPORTED_API bool getDefaultUnicastLocators( fastrtps::rtps::LocatorList_t& locators, uint32_t unicast_port) const override { @@ -248,7 +248,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `fillMetatrafficMulticastLocator()`. * Assign port to the given metatraffic multicast locator if not already defined */ - RTPS_DllAPI bool fillMetatrafficMulticastLocator( + FASTDDS_EXPORTED_API bool fillMetatrafficMulticastLocator( fastrtps::rtps::Locator_t& locator, uint32_t metatraffic_multicast_port) const override { @@ -259,7 +259,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `fillMetatrafficUnicastLocator()`. * Assign port to the given metatraffic unicast locator if not already defined */ - RTPS_DllAPI bool fillMetatrafficUnicastLocator( + FASTDDS_EXPORTED_API bool fillMetatrafficUnicastLocator( fastrtps::rtps::Locator_t& locator, uint32_t metatraffic_unicast_port) const override { @@ -270,7 +270,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `configureInitialPeerLocator()`. * Configure the initial peer locators list */ - RTPS_DllAPI bool configureInitialPeerLocator( + FASTDDS_EXPORTED_API bool configureInitialPeerLocator( fastrtps::rtps::Locator_t& locator, const fastrtps::rtps::PortParameters& port_params, uint32_t domainId, @@ -283,7 +283,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `fillUnicastLocator()`. * Assign port to the given unicast locator if not already defined */ - RTPS_DllAPI bool fillUnicastLocator( + FASTDDS_EXPORTED_API bool fillUnicastLocator( fastrtps::rtps::Locator_t& locator, uint32_t well_known_port) const override { @@ -292,7 +292,7 @@ class ChainingTransport : public TransportInterface //! Call the low-level transport `transform_remote_locator()`. //! Transforms a remote locator into a locator optimized for local communications. - RTPS_DllAPI bool transform_remote_locator( + FASTDDS_EXPORTED_API bool transform_remote_locator( const fastrtps::rtps::Locator_t& remote_locator, fastrtps::rtps::Locator_t& result_locator) const override { @@ -303,7 +303,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `max_recv_buffer_size()`. * @return The maximum datagram size for reception supported by the transport */ - RTPS_DllAPI uint32_t max_recv_buffer_size() const override + FASTDDS_EXPORTED_API uint32_t max_recv_buffer_size() const override { return low_level_transport_->max_recv_buffer_size(); } @@ -326,7 +326,7 @@ class ChainingTransport : public TransportInterface * we're sending to. * @param timeout Maximum blocking time. */ - RTPS_DllAPI virtual bool send( + FASTDDS_EXPORTED_API virtual bool send( fastrtps::rtps::SenderResource* low_sender_resource, const fastrtps::rtps::octet* send_buffer, uint32_t send_buffer_size, @@ -349,14 +349,14 @@ class ChainingTransport : public TransportInterface * @param local_locator Locator mapping to the local channel we're listening to. * @param[out] remote_locator Locator describing the remote destination we received a packet from. */ - RTPS_DllAPI virtual void receive( + FASTDDS_EXPORTED_API virtual void receive( TransportReceiverInterface* next_receiver, const fastrtps::rtps::octet* receive_buffer, uint32_t receive_buffer_size, const fastrtps::rtps::Locator_t& local_locator, const fastrtps::rtps::Locator_t& remote_locator) = 0; - RTPS_DllAPI void update_network_interfaces() override + FASTDDS_EXPORTED_API void update_network_interfaces() override { low_level_transport_->update_network_interfaces(); } @@ -364,7 +364,7 @@ class ChainingTransport : public TransportInterface //! Call the low-level transport `transform_remote_locator()`. //! Transforms a remote locator into a locator optimized for local communications, //! if allowed by both local and remote transports. - RTPS_DllAPI bool transform_remote_locator( + FASTDDS_EXPORTED_API bool transform_remote_locator( const fastrtps::rtps::Locator_t& remote_locator, fastrtps::rtps::Locator_t& result_locator, bool allowed_remote_localhost, @@ -378,7 +378,7 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `is_locator_allowed()`. * Must report whether the given locator is allowed by this transport. */ - RTPS_DllAPI bool is_locator_allowed( + FASTDDS_EXPORTED_API bool is_locator_allowed( const fastrtps::rtps::Locator_t& locator) const override { return low_level_transport_->is_locator_allowed(locator); diff --git a/include/fastdds/rtps/transport/ChainingTransportDescriptor.h b/include/fastdds/rtps/transport/ChainingTransportDescriptor.h index 85ed7bb66f6..8cfddb57638 100644 --- a/include/fastdds/rtps/transport/ChainingTransportDescriptor.h +++ b/include/fastdds/rtps/transport/ChainingTransportDescriptor.h @@ -36,14 +36,14 @@ namespace rtps { */ typedef struct ChainingTransportDescriptor : public TransportDescriptorInterface { - RTPS_DllAPI ChainingTransportDescriptor( + FASTDDS_EXPORTED_API ChainingTransportDescriptor( std::shared_ptr low_level) : TransportDescriptorInterface(low_level->maxMessageSize, low_level->maxInitialPeersRange) , low_level_descriptor(low_level) { } - RTPS_DllAPI ChainingTransportDescriptor( + FASTDDS_EXPORTED_API ChainingTransportDescriptor( const ChainingTransportDescriptor& t) : TransportDescriptorInterface(t) , low_level_descriptor(t.low_level_descriptor) @@ -51,18 +51,18 @@ typedef struct ChainingTransportDescriptor : public TransportDescriptorInterface } //! Returns the minimum size required for a send operation. - RTPS_DllAPI virtual uint32_t min_send_buffer_size() const override + FASTDDS_EXPORTED_API virtual uint32_t min_send_buffer_size() const override { return low_level_descriptor->min_send_buffer_size(); } //! Returns the maximum size expected for received messages. - RTPS_DllAPI virtual uint32_t max_message_size() const override + FASTDDS_EXPORTED_API virtual uint32_t max_message_size() const override { return low_level_descriptor->max_message_size(); } - RTPS_DllAPI virtual ~ChainingTransportDescriptor() = default; + FASTDDS_EXPORTED_API virtual ~ChainingTransportDescriptor() = default; //! Descriptor for lower level transport std::shared_ptr low_level_descriptor; diff --git a/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp b/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp index 44f96e589f6..fa3714d9c52 100644 --- a/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp +++ b/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -41,23 +41,23 @@ class PortBasedTransportDescriptor : public TransportDescriptorInterface using ReceptionThreadsConfigMap = std::map; //! Constructor - RTPS_DllAPI PortBasedTransportDescriptor( + FASTDDS_EXPORTED_API PortBasedTransportDescriptor( uint32_t maximumMessageSize, uint32_t maximumInitialPeersRange); //! Copy constructor - RTPS_DllAPI PortBasedTransportDescriptor( + FASTDDS_EXPORTED_API PortBasedTransportDescriptor( const PortBasedTransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI PortBasedTransportDescriptor& operator =( + FASTDDS_EXPORTED_API PortBasedTransportDescriptor& operator =( const PortBasedTransportDescriptor& t) = default; //! Destructor - virtual RTPS_DllAPI ~PortBasedTransportDescriptor() = default; + virtual FASTDDS_EXPORTED_API ~PortBasedTransportDescriptor() = default; //! Comparison operator - bool RTPS_DllAPI operator ==( + bool FASTDDS_EXPORTED_API operator ==( const PortBasedTransportDescriptor& t) const; /** @@ -76,25 +76,25 @@ class PortBasedTransportDescriptor : public TransportDescriptorInterface * * @return The ThreadSettings for the given port. */ - virtual RTPS_DllAPI const ThreadSettings& get_thread_config_for_port( + virtual FASTDDS_EXPORTED_API const ThreadSettings& get_thread_config_for_port( uint32_t port) const; - virtual RTPS_DllAPI bool set_thread_config_for_port( + virtual FASTDDS_EXPORTED_API bool set_thread_config_for_port( const uint32_t& port, const ThreadSettings& thread_settings); //! Returns the ThreadSettings for the default reception threads - RTPS_DllAPI const ThreadSettings& default_reception_threads() const; + FASTDDS_EXPORTED_API const ThreadSettings& default_reception_threads() const; //! Set the ThreadSettings for the default reception threads - virtual RTPS_DllAPI void default_reception_threads( + virtual FASTDDS_EXPORTED_API void default_reception_threads( const ThreadSettings& default_reception_threads); //! Returns the ThreadSettings for the user-configured reception threads - RTPS_DllAPI const ReceptionThreadsConfigMap& reception_threads() const; + FASTDDS_EXPORTED_API const ReceptionThreadsConfigMap& reception_threads() const; //! Set the ThreadSettings for the user-configured reception threads - virtual RTPS_DllAPI bool reception_threads( + virtual FASTDDS_EXPORTED_API bool reception_threads( const ReceptionThreadsConfigMap& reception_threads); protected: diff --git a/include/fastdds/rtps/transport/SocketTransportDescriptor.h b/include/fastdds/rtps/transport/SocketTransportDescriptor.h index 80c5a3a6a19..421fde9f8be 100644 --- a/include/fastdds/rtps/transport/SocketTransportDescriptor.h +++ b/include/fastdds/rtps/transport/SocketTransportDescriptor.h @@ -47,7 +47,7 @@ constexpr uint8_t s_defaultTTL = 1; struct SocketTransportDescriptor : public PortBasedTransportDescriptor { //! Constructor - RTPS_DllAPI SocketTransportDescriptor( + FASTDDS_EXPORTED_API SocketTransportDescriptor( uint32_t maximumMessageSize, uint32_t maximumInitialPeersRange) : PortBasedTransportDescriptor(maximumMessageSize, maximumInitialPeersRange) @@ -59,23 +59,23 @@ struct SocketTransportDescriptor : public PortBasedTransportDescriptor } //! Copy constructor - RTPS_DllAPI SocketTransportDescriptor( + FASTDDS_EXPORTED_API SocketTransportDescriptor( const SocketTransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI SocketTransportDescriptor& operator =( + FASTDDS_EXPORTED_API SocketTransportDescriptor& operator =( const SocketTransportDescriptor& t) = default; //! Destructor - virtual RTPS_DllAPI ~SocketTransportDescriptor() = default; + virtual FASTDDS_EXPORTED_API ~SocketTransportDescriptor() = default; - virtual RTPS_DllAPI uint32_t min_send_buffer_size() const override + virtual FASTDDS_EXPORTED_API uint32_t min_send_buffer_size() const override { return sendBufferSize; } //! Comparison operator - bool RTPS_DllAPI operator ==( + bool FASTDDS_EXPORTED_API operator ==( const SocketTransportDescriptor& t) const { return (this->sendBufferSize == t.min_send_buffer_size() && diff --git a/include/fastdds/rtps/transport/TCPTransportDescriptor.h b/include/fastdds/rtps/transport/TCPTransportDescriptor.h index a930c8467ab..c5cee7ae0b0 100644 --- a/include/fastdds/rtps/transport/TCPTransportDescriptor.h +++ b/include/fastdds/rtps/transport/TCPTransportDescriptor.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -304,21 +304,21 @@ struct TCPTransportDescriptor : public SocketTransportDescriptor } //! Constructor - RTPS_DllAPI TCPTransportDescriptor(); + FASTDDS_EXPORTED_API TCPTransportDescriptor(); //! Copy constructor - RTPS_DllAPI TCPTransportDescriptor( + FASTDDS_EXPORTED_API TCPTransportDescriptor( const TCPTransportDescriptor& t); //! Copy assignment - RTPS_DllAPI TCPTransportDescriptor& operator =( + FASTDDS_EXPORTED_API TCPTransportDescriptor& operator =( const TCPTransportDescriptor& t); //! Destructor virtual ~TCPTransportDescriptor() = default; //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const TCPTransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h index f6f3c8e2c4f..6d33d0b40d5 100644 --- a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h @@ -81,18 +81,18 @@ struct TCPv4TransportDescriptor : public TCPTransportDescriptor } //! Constructor - RTPS_DllAPI TCPv4TransportDescriptor(); + FASTDDS_EXPORTED_API TCPv4TransportDescriptor(); //! Copy constructor - RTPS_DllAPI TCPv4TransportDescriptor( + FASTDDS_EXPORTED_API TCPv4TransportDescriptor( const TCPv4TransportDescriptor& t); //! Copy assignment - RTPS_DllAPI TCPv4TransportDescriptor& operator =( + FASTDDS_EXPORTED_API TCPv4TransportDescriptor& operator =( const TCPv4TransportDescriptor& t); //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const TCPv4TransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h index 43513cde0a8..ad73604d97e 100644 --- a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h +++ b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h @@ -35,18 +35,18 @@ struct TCPv6TransportDescriptor : public TCPTransportDescriptor virtual TransportInterface* create_transport() const override; //! Constructor - RTPS_DllAPI TCPv6TransportDescriptor(); + FASTDDS_EXPORTED_API TCPv6TransportDescriptor(); //! Copy constructor - RTPS_DllAPI TCPv6TransportDescriptor( + FASTDDS_EXPORTED_API TCPv6TransportDescriptor( const TCPv6TransportDescriptor& t); //! Copy assignment - RTPS_DllAPI TCPv6TransportDescriptor& operator =( + FASTDDS_EXPORTED_API TCPv6TransportDescriptor& operator =( const TCPv6TransportDescriptor& t) = default; //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const TCPv6TransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/transport/TransportDescriptorInterface.h b/include/fastdds/rtps/transport/TransportDescriptorInterface.h index 255ac0c1e1b..2327566808c 100644 --- a/include/fastdds/rtps/transport/TransportDescriptorInterface.h +++ b/include/fastdds/rtps/transport/TransportDescriptorInterface.h @@ -19,7 +19,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -42,7 +42,7 @@ class TransportInterface; struct TransportDescriptorInterface { //! Constructor - RTPS_DllAPI TransportDescriptorInterface( + FASTDDS_EXPORTED_API TransportDescriptorInterface( uint32_t maximumMessageSize, uint32_t maximumInitialPeersRange) : maxMessageSize(maximumMessageSize) @@ -51,7 +51,7 @@ struct TransportDescriptorInterface } //! Copy constructor - RTPS_DllAPI TransportDescriptorInterface( + FASTDDS_EXPORTED_API TransportDescriptorInterface( const TransportDescriptorInterface& t) : maxMessageSize(t.maxMessageSize) , maxInitialPeersRange(t.maxInitialPeersRange) @@ -59,7 +59,7 @@ struct TransportDescriptorInterface } //! Copy assignment - RTPS_DllAPI TransportDescriptorInterface& operator =( + FASTDDS_EXPORTED_API TransportDescriptorInterface& operator =( const TransportDescriptorInterface& t) { maxMessageSize = t.maxMessageSize; @@ -68,20 +68,20 @@ struct TransportDescriptorInterface } //! Destructor - virtual RTPS_DllAPI ~TransportDescriptorInterface() = default; + virtual FASTDDS_EXPORTED_API ~TransportDescriptorInterface() = default; /** * Factory method pattern. It will create and return a TransportInterface * corresponding to this descriptor. This provides an interface to the NetworkFactory * to create the transports without the need to know about their type */ - virtual RTPS_DllAPI TransportInterface* create_transport() const = 0; + virtual FASTDDS_EXPORTED_API TransportInterface* create_transport() const = 0; //! Returns the minimum size required for a send operation. - virtual RTPS_DllAPI uint32_t min_send_buffer_size() const = 0; + virtual FASTDDS_EXPORTED_API uint32_t min_send_buffer_size() const = 0; //! Returns the maximum size expected for received messages. - virtual RTPS_DllAPI uint32_t max_message_size() const + virtual FASTDDS_EXPORTED_API uint32_t max_message_size() const { return maxMessageSize; } @@ -89,13 +89,13 @@ struct TransportDescriptorInterface /** Returns the maximum number of opened channels for each initial remote peer * (maximum number of guessed initial peers to try to connect) */ - virtual RTPS_DllAPI uint32_t max_initial_peers_range() const + virtual FASTDDS_EXPORTED_API uint32_t max_initial_peers_range() const { return maxInitialPeersRange; } //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const TransportDescriptorInterface& t) const { return (this->maxMessageSize == t.max_message_size() && @@ -103,13 +103,13 @@ struct TransportDescriptorInterface } //! Lock internal mutex (for Fast-DDS internal use) - RTPS_DllAPI void lock() + FASTDDS_EXPORTED_API void lock() { mtx_.lock(); } //! Unlock internal mutex (for Fast-DDS internal use) - RTPS_DllAPI void unlock() + FASTDDS_EXPORTED_API void unlock() { mtx_.unlock(); } diff --git a/include/fastdds/rtps/transport/TransportInterface.h b/include/fastdds/rtps/transport/TransportInterface.h index b36c5d40a07..b016492476b 100644 --- a/include/fastdds/rtps/transport/TransportInterface.h +++ b/include/fastdds/rtps/transport/TransportInterface.h @@ -57,7 +57,7 @@ using TransportNetmaskFilterInfo = std::pair; * locators can map to the same port, and hence the same channel. * @ingroup TRANSPORT_MODULE * */ -class RTPS_DllAPI TransportInterface +class FASTDDS_EXPORTED_API TransportInterface { public: diff --git a/include/fastdds/rtps/transport/TransportReceiverInterface.h b/include/fastdds/rtps/transport/TransportReceiverInterface.h index 779266a31bc..1c7e5d6f4c0 100644 --- a/include/fastdds/rtps/transport/TransportReceiverInterface.h +++ b/include/fastdds/rtps/transport/TransportReceiverInterface.h @@ -25,7 +25,7 @@ namespace rtps { * Interface against which to implement a data receiver, decoupled from transport internals. * @ingroup TRANSPORT_MODULE * */ -class RTPS_DllAPI TransportReceiverInterface +class FASTDDS_EXPORTED_API TransportReceiverInterface { public: diff --git a/include/fastdds/rtps/transport/UDPTransportDescriptor.h b/include/fastdds/rtps/transport/UDPTransportDescriptor.h index 18efac6128d..c06ae15d22a 100644 --- a/include/fastdds/rtps/transport/UDPTransportDescriptor.h +++ b/include/fastdds/rtps/transport/UDPTransportDescriptor.h @@ -16,7 +16,7 @@ #define _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_ #include -#include +#include namespace eprosima { namespace fastdds { @@ -39,18 +39,18 @@ struct UDPTransportDescriptor : public SocketTransportDescriptor virtual ~UDPTransportDescriptor() = default; //! Constructor - RTPS_DllAPI UDPTransportDescriptor(); + FASTDDS_EXPORTED_API UDPTransportDescriptor(); //! Copy constructor - RTPS_DllAPI UDPTransportDescriptor( + FASTDDS_EXPORTED_API UDPTransportDescriptor( const UDPTransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI UDPTransportDescriptor& operator =( + FASTDDS_EXPORTED_API UDPTransportDescriptor& operator =( const UDPTransportDescriptor& t) = default; //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const UDPTransportDescriptor& t) const; //! Source port to use for outgoing datagrams diff --git a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h index d43f81160c6..7bdae6be2f4 100644 --- a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h @@ -35,17 +35,17 @@ struct UDPv4TransportDescriptor : public UDPTransportDescriptor virtual TransportInterface* create_transport() const override; //! Constructor - RTPS_DllAPI UDPv4TransportDescriptor(); + FASTDDS_EXPORTED_API UDPv4TransportDescriptor(); //! Copy constructor - RTPS_DllAPI UDPv4TransportDescriptor( + FASTDDS_EXPORTED_API UDPv4TransportDescriptor( const UDPv4TransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI UDPv4TransportDescriptor& operator =( + FASTDDS_EXPORTED_API UDPv4TransportDescriptor& operator =( const UDPv4TransportDescriptor& t) = default; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const UDPv4TransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h index 2fa2e730646..8ab8a970956 100644 --- a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h +++ b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h @@ -37,17 +37,17 @@ struct UDPv6TransportDescriptor : public UDPTransportDescriptor virtual TransportInterface* create_transport() const override; //! Constructor - RTPS_DllAPI UDPv6TransportDescriptor(); + FASTDDS_EXPORTED_API UDPv6TransportDescriptor(); //! Copy constructor - RTPS_DllAPI UDPv6TransportDescriptor( + FASTDDS_EXPORTED_API UDPv6TransportDescriptor( const UDPv6TransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI UDPv6TransportDescriptor& operator =( + FASTDDS_EXPORTED_API UDPv6TransportDescriptor& operator =( const UDPv6TransportDescriptor& t) = default; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const UDPv6TransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp index 3b832ff10ba..fee25c4e869 100644 --- a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp @@ -20,7 +20,7 @@ #define _FASTDDS_RTPS_TRANSPORT_NETWORK_ALLOWEDNETWORKINTERFACE_HPP_ #include -#include +#include namespace eprosima { namespace fastdds { @@ -37,22 +37,22 @@ struct AllowedNetworkInterface : public NetworkInterfaceWithFilter using NetworkInterfaceWithFilter::NetworkInterfaceWithFilter; //! Destructor - virtual RTPS_DllAPI ~AllowedNetworkInterface() = default; + virtual FASTDDS_EXPORTED_API ~AllowedNetworkInterface() = default; //! Copy constructor - RTPS_DllAPI AllowedNetworkInterface( + FASTDDS_EXPORTED_API AllowedNetworkInterface( const AllowedNetworkInterface& iface) = default; //! Copy assignment - RTPS_DllAPI AllowedNetworkInterface& operator =( + FASTDDS_EXPORTED_API AllowedNetworkInterface& operator =( const AllowedNetworkInterface& iface) = default; //! Move constructor - RTPS_DllAPI AllowedNetworkInterface( + FASTDDS_EXPORTED_API AllowedNetworkInterface( AllowedNetworkInterface&& iface) = default; //! Move assignment - RTPS_DllAPI AllowedNetworkInterface& operator =( + FASTDDS_EXPORTED_API AllowedNetworkInterface& operator =( AllowedNetworkInterface&& iface) = default; }; diff --git a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp index b9ef6f7eb70..559bea4da90 100644 --- a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp @@ -20,7 +20,7 @@ #define _FASTDDS_RTPS_TRANSPORT_NETWORK_BLOCKEDNETWORKINTERFACE_HPP_ #include -#include +#include namespace eprosima { namespace fastdds { @@ -37,22 +37,22 @@ struct BlockedNetworkInterface : public NetworkInterface using NetworkInterface::NetworkInterface; //! Destructor - virtual RTPS_DllAPI ~BlockedNetworkInterface() = default; + virtual FASTDDS_EXPORTED_API ~BlockedNetworkInterface() = default; //! Copy constructor - RTPS_DllAPI BlockedNetworkInterface( + FASTDDS_EXPORTED_API BlockedNetworkInterface( const BlockedNetworkInterface& iface) = default; //! Copy assignment - RTPS_DllAPI BlockedNetworkInterface& operator =( + FASTDDS_EXPORTED_API BlockedNetworkInterface& operator =( const BlockedNetworkInterface& iface) = default; //! Move constructor - RTPS_DllAPI BlockedNetworkInterface( + FASTDDS_EXPORTED_API BlockedNetworkInterface( BlockedNetworkInterface&& iface) = default; //! Move assignment - RTPS_DllAPI BlockedNetworkInterface& operator =( + FASTDDS_EXPORTED_API BlockedNetworkInterface& operator =( BlockedNetworkInterface&& iface) = default; }; diff --git a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp index f2ec8e67c32..09d0d8926cd 100644 --- a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp +++ b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp @@ -21,7 +21,7 @@ #include -#include +#include namespace eprosima { namespace fastdds { @@ -34,7 +34,7 @@ enum class NetmaskFilterKind ON }; -RTPS_DllAPI std::ostream& operator <<( +FASTDDS_EXPORTED_API std::ostream& operator <<( std::ostream& output, const NetmaskFilterKind& netmask_filter_kind); diff --git a/include/fastdds/rtps/transport/network/NetworkInterface.hpp b/include/fastdds/rtps/transport/network/NetworkInterface.hpp index 15fd5188827..be7c9c3cdf2 100644 --- a/include/fastdds/rtps/transport/network/NetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/NetworkInterface.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -37,36 +37,36 @@ namespace rtps { struct NetworkInterface { //! Constructor by name - RTPS_DllAPI NetworkInterface( + FASTDDS_EXPORTED_API NetworkInterface( const std::string& name); //! Constructor by device name, IP address string and locator with mask - RTPS_DllAPI NetworkInterface( + FASTDDS_EXPORTED_API NetworkInterface( const std::string& device, const std::string& ip, const LocatorWithMask& locator); //! Destructor - virtual RTPS_DllAPI ~NetworkInterface() = default; + virtual FASTDDS_EXPORTED_API ~NetworkInterface() = default; //! Copy constructor - RTPS_DllAPI NetworkInterface( + FASTDDS_EXPORTED_API NetworkInterface( const NetworkInterface& iface) = default; //! Copy assignment - RTPS_DllAPI NetworkInterface& operator =( + FASTDDS_EXPORTED_API NetworkInterface& operator =( const NetworkInterface& iface) = default; //! Move constructor - RTPS_DllAPI NetworkInterface( + FASTDDS_EXPORTED_API NetworkInterface( NetworkInterface&& iface) = default; //! Move assignment - RTPS_DllAPI NetworkInterface& operator =( + FASTDDS_EXPORTED_API NetworkInterface& operator =( NetworkInterface&& iface) = default; //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const NetworkInterface& iface) const; //! Interface device name or IP address in string format (to be filled by the user) diff --git a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp index a37113b8e0d..bb428b58c3a 100644 --- a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp +++ b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp @@ -23,7 +23,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -38,12 +38,12 @@ namespace rtps { struct NetworkInterfaceWithFilter : public NetworkInterface { //! Constructor by name and netmask filter - RTPS_DllAPI NetworkInterfaceWithFilter( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter( const std::string& name, NetmaskFilterKind netmask_filter); //! Constructor by name - RTPS_DllAPI NetworkInterfaceWithFilter( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter( const std::string& name); //! Constructor by device name, IP address string, locator with mask and netmask filter @@ -54,32 +54,32 @@ struct NetworkInterfaceWithFilter : public NetworkInterface NetmaskFilterKind netmask_filter); //! Constructor by device name, IP address string and locator with mask - RTPS_DllAPI NetworkInterfaceWithFilter( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter( const std::string& device, const std::string& ip, const LocatorWithMask& locator); //! Destructor - virtual RTPS_DllAPI ~NetworkInterfaceWithFilter() = default; + virtual FASTDDS_EXPORTED_API ~NetworkInterfaceWithFilter() = default; //! Copy constructor - RTPS_DllAPI NetworkInterfaceWithFilter( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter( const NetworkInterfaceWithFilter& iface) = default; //! Copy assignment - RTPS_DllAPI NetworkInterfaceWithFilter& operator =( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter& operator =( const NetworkInterfaceWithFilter& iface) = default; //! Move constructor - RTPS_DllAPI NetworkInterfaceWithFilter( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter( NetworkInterfaceWithFilter&& iface) = default; //! Move assignment - RTPS_DllAPI NetworkInterfaceWithFilter& operator =( + FASTDDS_EXPORTED_API NetworkInterfaceWithFilter& operator =( NetworkInterfaceWithFilter&& iface) = default; //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const NetworkInterfaceWithFilter& iface) const; //! Netmask filter configuration diff --git a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h index db8d1951607..54b0509bd1d 100644 --- a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h +++ b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h @@ -19,7 +19,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -55,24 +55,24 @@ struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor } //! Constructor - RTPS_DllAPI SharedMemTransportDescriptor(); + FASTDDS_EXPORTED_API SharedMemTransportDescriptor(); //! Copy constructor - RTPS_DllAPI SharedMemTransportDescriptor( + FASTDDS_EXPORTED_API SharedMemTransportDescriptor( const SharedMemTransportDescriptor& t) = default; //! Copy assignment - RTPS_DllAPI SharedMemTransportDescriptor& operator =( + FASTDDS_EXPORTED_API SharedMemTransportDescriptor& operator =( const SharedMemTransportDescriptor& t) = default; //! Return the size of the shared memory segment - RTPS_DllAPI uint32_t segment_size() const + FASTDDS_EXPORTED_API uint32_t segment_size() const { return segment_size_; } //! Set the size of the shared memory segment - RTPS_DllAPI void segment_size( + FASTDDS_EXPORTED_API void segment_size( uint32_t segment_size) { segment_size_ = segment_size; @@ -85,66 +85,66 @@ struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor } //! Set the maximum size of a single message in the transport (in octets) - RTPS_DllAPI void max_message_size( + FASTDDS_EXPORTED_API void max_message_size( uint32_t max_message_size) { maxMessageSize = max_message_size; } //! Return the size of the listening port (in messages) - RTPS_DllAPI uint32_t port_queue_capacity() const + FASTDDS_EXPORTED_API uint32_t port_queue_capacity() const { return port_queue_capacity_; } //! Set the size of the listening port (in messages) - RTPS_DllAPI void port_queue_capacity( + FASTDDS_EXPORTED_API void port_queue_capacity( uint32_t port_queue_capacity) { port_queue_capacity_ = port_queue_capacity; } //! Return the timeout for the health check of ports (ms) - RTPS_DllAPI uint32_t healthy_check_timeout_ms() const + FASTDDS_EXPORTED_API uint32_t healthy_check_timeout_ms() const { return healthy_check_timeout_ms_; } //! Set the timeout for the health check of ports (ms) - RTPS_DllAPI void healthy_check_timeout_ms( + FASTDDS_EXPORTED_API void healthy_check_timeout_ms( uint32_t healthy_check_timeout_ms) { healthy_check_timeout_ms_ = healthy_check_timeout_ms; } //! Return the full path of the protocol dump file - RTPS_DllAPI std::string rtps_dump_file() const + FASTDDS_EXPORTED_API std::string rtps_dump_file() const { return rtps_dump_file_; } //! Set the full path of the protocol dump file - RTPS_DllAPI void rtps_dump_file( + FASTDDS_EXPORTED_API void rtps_dump_file( const std::string& rtps_dump_file) { rtps_dump_file_ = rtps_dump_file; } //! Return the thread settings for the transport dump thread - RTPS_DllAPI ThreadSettings dump_thread() const + FASTDDS_EXPORTED_API ThreadSettings dump_thread() const { return dump_thread_; } //! Set the thread settings for the transport dump thread - RTPS_DllAPI void dump_thread( + FASTDDS_EXPORTED_API void dump_thread( const ThreadSettings& dump_thread) { dump_thread_ = dump_thread; } //! Comparison operator - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const SharedMemTransportDescriptor& t) const; private: diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h index dafa7798ae8..79665530133 100644 --- a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h @@ -81,7 +81,7 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor uint32_t dropLogLength; //! Constructor - RTPS_DllAPI test_UDPv4TransportDescriptor(); + FASTDDS_EXPORTED_API test_UDPv4TransportDescriptor(); //! Destructor virtual ~test_UDPv4TransportDescriptor() = default; @@ -90,24 +90,24 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor virtual TransportInterface* create_transport() const override; //! Copy constructor - RTPS_DllAPI test_UDPv4TransportDescriptor( + FASTDDS_EXPORTED_API test_UDPv4TransportDescriptor( const test_UDPv4TransportDescriptor& t) = delete; //! Copy assignment - RTPS_DllAPI test_UDPv4TransportDescriptor& operator =( + FASTDDS_EXPORTED_API test_UDPv4TransportDescriptor& operator =( const test_UDPv4TransportDescriptor& t) = delete; //! Move constructor - RTPS_DllAPI test_UDPv4TransportDescriptor( + FASTDDS_EXPORTED_API test_UDPv4TransportDescriptor( test_UDPv4TransportDescriptor&& t) = delete; //! Move assignment - RTPS_DllAPI test_UDPv4TransportDescriptor& operator =( + FASTDDS_EXPORTED_API test_UDPv4TransportDescriptor& operator =( test_UDPv4TransportDescriptor&& t) = delete; //! Comparison operator // Filters are not included - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const test_UDPv4TransportDescriptor& t) const; }; diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.h index 3ff692e1b3f..43c8f4bd207 100644 --- a/include/fastdds/rtps/writer/RTPSWriter.h +++ b/include/fastdds/rtps/writer/RTPSWriter.h @@ -137,12 +137,12 @@ class RTPSWriter }, changeKind, handle); } - RTPS_DllAPI CacheChange_t* new_change( + FASTDDS_EXPORTED_API CacheChange_t* new_change( const std::function& dataCdrSerializedSize, ChangeKind_t changeKind, InstanceHandle_t handle = c_InstanceHandle_Unknown); - RTPS_DllAPI CacheChange_t* new_change( + FASTDDS_EXPORTED_API CacheChange_t* new_change( ChangeKind_t changeKind, InstanceHandle_t handle = c_InstanceHandle_Unknown); @@ -159,7 +159,7 @@ class RTPSWriter * * @post memory pointed to by @c change is not accessed */ - RTPS_DllAPI bool release_change( + FASTDDS_EXPORTED_API bool release_change( CacheChange_t* change); /** @@ -167,7 +167,7 @@ class RTPSWriter * @param data Pointer to the ReaderProxyData object added. * @return True if added. */ - RTPS_DllAPI virtual bool matched_reader_add( + FASTDDS_EXPORTED_API virtual bool matched_reader_add( const ReaderProxyData& data) = 0; /** @@ -175,7 +175,7 @@ class RTPSWriter * @param reader_guid GUID of the reader to remove. * @return True if removed. */ - RTPS_DllAPI virtual bool matched_reader_remove( + FASTDDS_EXPORTED_API virtual bool matched_reader_remove( const GUID_t& reader_guid) = 0; /** @@ -183,7 +183,7 @@ class RTPSWriter * @param reader_guid GUID of the reader to check. * @return True if it was matched. */ - RTPS_DllAPI virtual bool matched_reader_is_matched( + FASTDDS_EXPORTED_API virtual bool matched_reader_is_matched( const GUID_t& reader_guid) = 0; /** @@ -195,7 +195,7 @@ class RTPSWriter * @param filter The content filter to use on this writer. May be @c nullptr to remove the content filter * (i.e. treat all samples as relevant). */ - RTPS_DllAPI virtual void reader_data_filter( + FASTDDS_EXPORTED_API virtual void reader_data_filter( fastdds::rtps::IReaderDataFilter* filter) = 0; /** @@ -203,7 +203,7 @@ class RTPSWriter * * @return The content filter used on this writer. */ - RTPS_DllAPI virtual const fastdds::rtps::IReaderDataFilter* reader_data_filter() const = 0; + FASTDDS_EXPORTED_API virtual const fastdds::rtps::IReaderDataFilter* reader_data_filter() const = 0; /** * @brief Check if a specific change has been delivered to the transport layer of every matched remote RTPSReader @@ -212,7 +212,7 @@ class RTPSWriter * @param seq_num Sequence number of the change to check. * @return true if delivered. False otherwise. */ - RTPS_DllAPI virtual bool has_been_fully_delivered( + FASTDDS_EXPORTED_API virtual bool has_been_fully_delivered( const SequenceNumber_t& seq_num) const { static_cast(seq_num); @@ -224,7 +224,7 @@ class RTPSWriter * Is only useful in reliable Writer. In BE Writers returns false when pending to be sent. * @return True if acknowledged by all. */ - RTPS_DllAPI virtual bool is_acked_by_all( + FASTDDS_EXPORTED_API virtual bool is_acked_by_all( const CacheChange_t* /*a_change*/) const { return false; @@ -234,7 +234,7 @@ class RTPSWriter * Waits until all changes were acknowledged or max_wait. * @return True if all were acknowledged. */ - RTPS_DllAPI virtual bool wait_for_all_acked( + FASTDDS_EXPORTED_API virtual bool wait_for_all_acked( const Duration_t& /*max_wait*/) { return true; @@ -244,26 +244,26 @@ class RTPSWriter * Update the Attributes of the Writer. * @param att New attributes */ - RTPS_DllAPI virtual void updateAttributes( + FASTDDS_EXPORTED_API virtual void updateAttributes( const WriterAttributes& att) = 0; /** * Get Min Seq Num in History. * @return Minimum sequence number in history */ - RTPS_DllAPI SequenceNumber_t get_seq_num_min(); + FASTDDS_EXPORTED_API SequenceNumber_t get_seq_num_min(); /** * Get Max Seq Num in History. * @return Maximum sequence number in history */ - RTPS_DllAPI SequenceNumber_t get_seq_num_max(); + FASTDDS_EXPORTED_API SequenceNumber_t get_seq_num_max(); /** * Get maximum size of the serialized type * @return Maximum size of the serialized type */ - RTPS_DllAPI uint32_t getTypeMaxSerialized(); + FASTDDS_EXPORTED_API uint32_t getTypeMaxSerialized(); //!Get maximum size of the data uint32_t getMaxDataSize(); @@ -276,12 +276,12 @@ class RTPSWriter * Get listener * @return Listener */ - RTPS_DllAPI inline WriterListener* getListener() + FASTDDS_EXPORTED_API inline WriterListener* getListener() { return mp_listener; } - RTPS_DllAPI inline bool set_listener( + FASTDDS_EXPORTED_API inline bool set_listener( WriterListener* listener) { mp_listener = listener; @@ -292,7 +292,7 @@ class RTPSWriter * Get the publication mode * @return publication mode */ - RTPS_DllAPI inline bool isAsync() const + FASTDDS_EXPORTED_API inline bool isAsync() const { return is_async_; } @@ -302,7 +302,7 @@ class RTPSWriter * @param max Maximum number of changes to remove. * @return at least one change has been removed */ - RTPS_DllAPI bool remove_older_changes( + FASTDDS_EXPORTED_API bool remove_older_changes( unsigned int max = 0); /** @@ -311,7 +311,7 @@ class RTPSWriter * @return Best effort writers always return false. * Reliable writers override this method. */ - RTPS_DllAPI virtual bool get_disable_positive_acks() const + FASTDDS_EXPORTED_API virtual bool get_disable_positive_acks() const { return false; } @@ -345,7 +345,7 @@ class RTPSWriter * @param listener * @return true if successfully added */ - RTPS_DllAPI bool add_statistics_listener( + FASTDDS_EXPORTED_API bool add_statistics_listener( std::shared_ptr listener); /** @@ -353,7 +353,7 @@ class RTPSWriter * @param listener * @return true if successfully removed */ - RTPS_DllAPI bool remove_statistics_listener( + FASTDDS_EXPORTED_API bool remove_statistics_listener( std::shared_ptr listener); /** @@ -361,7 +361,7 @@ class RTPSWriter * * @param enabled_writers The new mask to set */ - RTPS_DllAPI void set_enabled_statistics_writers_mask( + FASTDDS_EXPORTED_API void set_enabled_statistics_writers_mask( uint32_t enabled_writers); /** @@ -370,7 +370,7 @@ class RTPSWriter * @param [out] connection_list of the writer * @return True if could be retrieved */ - RTPS_DllAPI virtual bool get_connections( + FASTDDS_EXPORTED_API virtual bool get_connections( fastdds::statistics::rtps::ConnectionList& connection_list) = 0; #endif // FASTDDS_STATISTICS diff --git a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h b/include/fastdds/rtps/writer/WriterDiscoveryInfo.h index c3a1ae2b8b8..9167f72a09a 100644 --- a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h +++ b/include/fastdds/rtps/writer/WriterDiscoveryInfo.h @@ -18,7 +18,7 @@ #ifndef _RTPS_WRITER_WRITERDISCOVERYINFO_H_ #define _RTPS_WRITER_WRITERDISCOVERYINFO_H_ -#include +#include #include namespace eprosima { @@ -36,7 +36,7 @@ struct WriterDiscoveryInfo //!Enum DISCOVERY_STATUS, four different status for discovered writers. //!@ingroup RTPS_MODULE #if defined(_WIN32) - enum RTPS_DllAPI DISCOVERY_STATUS + enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else enum DISCOVERY_STATUS #endif // if defined(_WIN32) @@ -65,8 +65,8 @@ struct WriterDiscoveryInfo const WriterProxyData& info; }; -} -} -} +} // namespace rtps +} // namespace fastrtps +} // namespace eprosima #endif // _RTPS_WRITER_WRITERDISCOVERYINFO_H_ diff --git a/include/fastdds/rtps/writer/WriterListener.h b/include/fastdds/rtps/writer/WriterListener.h index 4dbd52290de..8932c7d99b9 100644 --- a/include/fastdds/rtps/writer/WriterListener.h +++ b/include/fastdds/rtps/writer/WriterListener.h @@ -37,7 +37,7 @@ struct CacheChange_t; * Class WriterListener with virtual method so the user can implement callbacks to certain events. * @ingroup WRITER_MODULE */ -class RTPS_DllAPI WriterListener +class FASTDDS_EXPORTED_API WriterListener { public: diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp index 5f254c9af36..80ac46d1218 100644 --- a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include using eprosima::fastrtps::types::ReturnCode_t; @@ -66,7 +66,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * RETCODE_OK if the DataWriter has been created or if it has been created previously, * and RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t enable_statistics_datawriter( + FASTDDS_EXPORTED_API ReturnCode_t enable_statistics_datawriter( const std::string& topic_name, const eprosima::fastdds::dds::DataWriterQos& dwqos); @@ -81,7 +81,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * RETCODE_OK if the DataWriter has been created or if it has been created previously, * and RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t enable_statistics_datawriter_with_profile( + FASTDDS_EXPORTED_API ReturnCode_t enable_statistics_datawriter_with_profile( const std::string& profile_name, const std::string& topic_name); @@ -93,7 +93,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * RETCODE_OK if the DataWriter has been correctly deleted or does not exist, * and RETCODE_ERROR otherwise */ - RTPS_DllAPI ReturnCode_t disable_statistics_datawriter( + FASTDDS_EXPORTED_API ReturnCode_t disable_statistics_datawriter( const std::string& topic_name); /** @@ -102,7 +102,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return Reference to the Statistics DomainParticipant if successful. * nullptr otherwise. */ - RTPS_DllAPI static DomainParticipant* narrow( + FASTDDS_EXPORTED_API static DomainParticipant* narrow( eprosima::fastdds::dds::DomainParticipant* domain_participant); /** @@ -111,7 +111,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return Constant reference to the Statistics DomainParticipant if successful. * nullptr otherwise. */ - RTPS_DllAPI static const DomainParticipant* narrow( + FASTDDS_EXPORTED_API static const DomainParticipant* narrow( const eprosima::fastdds::dds::DomainParticipant* domain_participant); /** @@ -123,7 +123,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * * @note Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t enable_monitor_service(); + FASTDDS_EXPORTED_API ReturnCode_t enable_monitor_service(); /** * Disables the monitor service in this DomainParticipant. Does nothing if the service was not enabled before. @@ -135,7 +135,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * * @note Not supported yet. Currently returns RETCODE_UNSUPPORTED */ - RTPS_DllAPI ReturnCode_t disable_monitor_service(); + FASTDDS_EXPORTED_API ReturnCode_t disable_monitor_service(); /** * fills in the ParticipantProxyData from a MonitorService Message @@ -146,7 +146,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::ParticipantProxyData& data, statistics::MonitorServiceStatusData& msg); @@ -159,7 +159,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::WriterProxyData& data, statistics::MonitorServiceStatusData& msg); @@ -172,7 +172,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::ReaderProxyData& data, statistics::MonitorServiceStatusData& msg); @@ -185,7 +185,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::ParticipantProxyData& data, const statistics::MonitorServiceStatusData& msg); @@ -198,7 +198,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::WriterProxyData& data, const statistics::MonitorServiceStatusData& msg); @@ -211,7 +211,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_OK if the operation succeeds. * @return RETCODE_ERROR if the operation fails. */ - RTPS_DllAPI ReturnCode_t fill_discovery_data_from_cdr_message( + FASTDDS_EXPORTED_API ReturnCode_t fill_discovery_data_from_cdr_message( fastrtps::rtps::ReaderProxyData& data, const statistics::MonitorServiceStatusData& msg); diff --git a/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp b/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp index 2e286b3269c..d09696544d8 100644 --- a/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp +++ b/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp @@ -20,7 +20,7 @@ #define _FASTDDS_STATISTICS_DDS_PUBLISHER_QOS_DATAWRITERQOS_HPP_ #include -#include +#include namespace eprosima { namespace fastdds { @@ -39,7 +39,7 @@ class DataWriterQos : public eprosima::fastdds::dds::DataWriterQos /** * @brief Constructor */ - RTPS_DllAPI DataWriterQos(); + FASTDDS_EXPORTED_API DataWriterQos(); }; //! Constant to access default Statistics DataWriter Qos diff --git a/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp index 82bc22f8abb..d5bcc23a3c6 100644 --- a/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp +++ b/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp @@ -38,7 +38,7 @@ class DataReaderQos : public eprosima::fastdds::dds::DataReaderQos /** * @brief Constructor */ - RTPS_DllAPI DataReaderQos(); + FASTDDS_EXPORTED_API DataReaderQos(); }; /** @@ -53,7 +53,7 @@ class MonitorServiceDataReaderQos : public eprosima::fastdds::dds::DataReaderQos /** * @brief Constructor */ - RTPS_DllAPI MonitorServiceDataReaderQos(); + FASTDDS_EXPORTED_API MonitorServiceDataReaderQos(); }; //! Constant to access default Statistics DataReader Qos diff --git a/include/fastrtps/Domain.h b/include/fastrtps/Domain.h index db99b55fcd4..27511afe8cd 100644 --- a/include/fastrtps/Domain.h +++ b/include/fastrtps/Domain.h @@ -67,7 +67,7 @@ class Domain * @param listen ParticipantListener Pointer. * @return Participant pointer. (nullptr if not created.) */ - RTPS_DllAPI DEPRECATED static Participant* createParticipant( + FASTDDS_EXPORTED_API DEPRECATED static Participant* createParticipant( const std::string& participant_profile, ParticipantListener* listen = nullptr); @@ -77,12 +77,12 @@ class Domain * @param listen ParticipantListener Pointer. * @return Participant pointer. (nullptr if not created.) */ - RTPS_DllAPI DEPRECATED static Participant* createParticipant( + FASTDDS_EXPORTED_API DEPRECATED static Participant* createParticipant( const ParticipantAttributes& att, ParticipantListener* listen = nullptr); //!Fills participant_attributes with the default values. - RTPS_DllAPI static void getDefaultParticipantAttributes( + FASTDDS_EXPORTED_API static void getDefaultParticipantAttributes( ParticipantAttributes& participant_attributes); /** @@ -92,7 +92,7 @@ class Domain * @param listen Pointer to the PublisherListener. * @return Pointer to the created Publisher (nullptr if not created). */ - RTPS_DllAPI static Publisher* createPublisher( + FASTDDS_EXPORTED_API static Publisher* createPublisher( Participant* part, const std::string& publisher_profile, PublisherListener* listen = nullptr); @@ -104,13 +104,13 @@ class Domain * @param listen Pointer to the PublisherListener. * @return Pointer to the created Publisher (nullptr if not created). */ - RTPS_DllAPI static Publisher* createPublisher( + FASTDDS_EXPORTED_API static Publisher* createPublisher( Participant* part, const PublisherAttributes& att, PublisherListener* listen = nullptr); //!Fills publisher_attributes with the default values. - RTPS_DllAPI static void getDefaultPublisherAttributes( + FASTDDS_EXPORTED_API static void getDefaultPublisherAttributes( PublisherAttributes& publisher_attributes); /** @@ -120,7 +120,7 @@ class Domain * @param listen Pointer to the SubscriberListener. * @return Pointer to the created Subscriber (nullptr if not created). */ - RTPS_DllAPI static Subscriber* createSubscriber( + FASTDDS_EXPORTED_API static Subscriber* createSubscriber( Participant* part, const std::string& subscriber_profile, SubscriberListener* listen = nullptr); @@ -132,13 +132,13 @@ class Domain * @param listen Pointer to the SubscriberListener. * @return Pointer to the created Subscriber (nullptr if not created). */ - RTPS_DllAPI static Subscriber* createSubscriber( + FASTDDS_EXPORTED_API static Subscriber* createSubscriber( Participant* part, const SubscriberAttributes& att, SubscriberListener* listen = nullptr); //!Fills subscriber_attributes with the default values. - RTPS_DllAPI static void getDefaultSubscriberAttributes( + FASTDDS_EXPORTED_API static void getDefaultSubscriberAttributes( SubscriberAttributes& subscriber_attributes); /** @@ -146,7 +146,7 @@ class Domain * @param part Pointer to the participant. * @return True if correctly removed. */ - RTPS_DllAPI static bool removeParticipant( + FASTDDS_EXPORTED_API static bool removeParticipant( Participant* part); /** @@ -154,7 +154,7 @@ class Domain * @param pub Pointer to the Publisher. * @return True if correctly removed. */ - RTPS_DllAPI static bool removePublisher( + FASTDDS_EXPORTED_API static bool removePublisher( Publisher* pub); /** @@ -162,7 +162,7 @@ class Domain * @param sub Pointer to the Subscriber. * @return True if correctly removed. */ - RTPS_DllAPI static bool removeSubscriber( + FASTDDS_EXPORTED_API static bool removeSubscriber( Subscriber* sub); /** @@ -172,7 +172,7 @@ class Domain * @param type Returned type. * @return True if type was found. */ - RTPS_DllAPI static bool getRegisteredType( + FASTDDS_EXPORTED_API static bool getRegisteredType( Participant* part, const char* typeName, fastdds::dds::TopicDataType** type); @@ -183,7 +183,7 @@ class Domain * @param type Pointer to the Type. * @return True if correctly registered. */ - RTPS_DllAPI static bool registerType( + FASTDDS_EXPORTED_API static bool registerType( Participant* part, fastdds::dds::TopicDataType* type); @@ -193,7 +193,7 @@ class Domain * @param type Pointer to the Type. * @return True if correctly registered. */ - RTPS_DllAPI static bool registerDynamicType( + FASTDDS_EXPORTED_API static bool registerDynamicType( Participant* part, types::DynamicPubSubType* type); @@ -203,21 +203,21 @@ class Domain * @param typeName Name of the type. * @return True if correctly unregistered. */ - RTPS_DllAPI static bool unregisterType( + FASTDDS_EXPORTED_API static bool unregisterType( Participant* part, const char* typeName); /** * Stop and remove all participants, publishers and subscribers in this Domain. */ - RTPS_DllAPI static void stopAll(); + FASTDDS_EXPORTED_API static void stopAll(); /** * Load profiles from XML file. * @param xml_profile_file XML profile file. * @return True if correctly loaded. */ - RTPS_DllAPI static bool loadXMLProfilesFile( + FASTDDS_EXPORTED_API static bool loadXMLProfilesFile( const std::string& xml_profile_file); /** @@ -226,7 +226,7 @@ class Domain * @param length length of data. * @return True if correctly loaded. */ - RTPS_DllAPI static bool loadXMLProfilesString( + FASTDDS_EXPORTED_API static bool loadXMLProfilesString( const char* data, size_t length); diff --git a/include/fastrtps/participant/Participant.h b/include/fastrtps/participant/Participant.h index cecd26f9aa0..d79557cf6f4 100644 --- a/include/fastrtps/participant/Participant.h +++ b/include/fastrtps/participant/Participant.h @@ -26,79 +26,80 @@ #include namespace eprosima { -namespace fastrtps{ +namespace fastrtps { class ParticipantImpl; class ParticipantAttributes; -namespace rtps -{ - class WriterProxyData; - class ReaderProxyData; - class ResourceEvent; - class RTPSParticipant; -} +namespace rtps { +class WriterProxyData; +class ReaderProxyData; +class ResourceEvent; +class RTPSParticipant; +} // namespace rtps /** * Class Participant used to group Publishers and Subscribers into a single working unit. * @ingroup FASTRTPS_MODULE */ -class RTPS_DllAPI Participant +class FASTDDS_EXPORTED_API Participant { - public: - /** - * Get the rtps::GUID_t of the associated RTPSParticipant. - * @return rtps::GUID_t - */ - const rtps::GUID_t& getGuid() const; - - /** - * Get the ParticipantAttributes. - * @return ParticipantAttributes. - */ - const ParticipantAttributes& getAttributes() const; - - /** - * Called when using a StaticEndpointDiscovery mechanism different that the one - * included in FastRTPS, for example when communicating with other implementations. - * It indicates to the Participant that an Endpoint from the XML has been discovered and - * should be activated. - * @param partguid Participant rtps::GUID_t. - * @param userId User defined ID as shown in the XML file. - * @param kind EndpointKind (WRITER or READER) - * @return True if correctly found and activated. - */ - bool newRemoteEndpointDiscovered( - const rtps::GUID_t& partguid, - uint16_t userId, - rtps::EndpointKind_t kind); - - /** - * Returns a list with the participant names. - * @return list of participant names. - */ - std::vector getParticipantNames() const; - - /** - * @brief Asserts liveliness of manual by participant publishers - */ - void assert_liveliness(); - - rtps::ResourceEvent& get_resource_event() const; - - private: - Participant(); - - virtual ~Participant(); - - ParticipantImpl* mp_impl; - - friend class Domain; - - friend class ParticipantImpl; +public: + + /** + * Get the rtps::GUID_t of the associated RTPSParticipant. + * @return rtps::GUID_t + */ + const rtps::GUID_t& getGuid() const; + + /** + * Get the ParticipantAttributes. + * @return ParticipantAttributes. + */ + const ParticipantAttributes& getAttributes() const; + + /** + * Called when using a StaticEndpointDiscovery mechanism different that the one + * included in FastRTPS, for example when communicating with other implementations. + * It indicates to the Participant that an Endpoint from the XML has been discovered and + * should be activated. + * @param partguid Participant rtps::GUID_t. + * @param userId User defined ID as shown in the XML file. + * @param kind EndpointKind (WRITER or READER) + * @return True if correctly found and activated. + */ + bool newRemoteEndpointDiscovered( + const rtps::GUID_t& partguid, + uint16_t userId, + rtps::EndpointKind_t kind); + + /** + * Returns a list with the participant names. + * @return list of participant names. + */ + std::vector getParticipantNames() const; + + /** + * @brief Asserts liveliness of manual by participant publishers + */ + void assert_liveliness(); + + rtps::ResourceEvent& get_resource_event() const; + +private: + + Participant(); + + virtual ~Participant(); + + ParticipantImpl* mp_impl; + + friend class Domain; + + friend class ParticipantImpl; }; -} +} // namespace fastrtps } /* namespace eprosima */ #endif /* PARTICIPANT_H_ */ diff --git a/include/fastrtps/publisher/Publisher.h b/include/fastrtps/publisher/Publisher.h index 9605d7a7bf2..027e427920e 100644 --- a/include/fastrtps/publisher/Publisher.h +++ b/include/fastrtps/publisher/Publisher.h @@ -20,7 +20,7 @@ #ifndef PUBLISHER_H_ #define PUBLISHER_H_ -#include +#include #include #include #include @@ -43,7 +43,7 @@ class PublisherImpl; * Class Publisher, used to send data to associated subscribers. * @ingroup FASTRTPS_MODULE */ -class RTPS_DllAPI Publisher +class FASTDDS_EXPORTED_API Publisher { friend class PublisherImpl; virtual ~Publisher(); diff --git a/include/fastrtps/publisher/PublisherListener.h b/include/fastrtps/publisher/PublisherListener.h index 7775b90a758..71dcae16409 100644 --- a/include/fastrtps/publisher/PublisherListener.h +++ b/include/fastrtps/publisher/PublisherListener.h @@ -31,7 +31,7 @@ class Publisher; /** * Class PublisherListener, allows the end user to implement callbacks triggered by certain events. */ -class RTPS_DllAPI PublisherListener +class FASTDDS_EXPORTED_API PublisherListener { public: diff --git a/include/fastrtps/subscriber/SampleInfo.h b/include/fastrtps/subscriber/SampleInfo.h index 81556d92761..e8cd4fcb07a 100644 --- a/include/fastrtps/subscriber/SampleInfo.h +++ b/include/fastrtps/subscriber/SampleInfo.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace eprosima { namespace fastrtps { @@ -35,7 +35,7 @@ namespace fastrtps { * Class SampleInfo_t with information that is provided along a sample when reading data from a Subscriber. * @ingroup FASTRTPS_MODULE */ -class RTPS_DllAPI SampleInfo_t +class FASTDDS_EXPORTED_API SampleInfo_t { public: diff --git a/include/fastrtps/subscriber/Subscriber.h b/include/fastrtps/subscriber/Subscriber.h index 0b50005ba21..25c9ebba8a1 100644 --- a/include/fastrtps/subscriber/Subscriber.h +++ b/include/fastrtps/subscriber/Subscriber.h @@ -38,7 +38,7 @@ class SampleInfo_t; * This class should not be instantiated directly. * DomainRTPSParticipant class should be used to correctly create this element. */ -class RTPS_DllAPI Subscriber +class FASTDDS_EXPORTED_API Subscriber { friend class SubscriberImpl; diff --git a/include/fastrtps/subscriber/SubscriberListener.h b/include/fastrtps/subscriber/SubscriberListener.h index 140b98e8ac5..d7506a992d9 100644 --- a/include/fastrtps/subscriber/SubscriberListener.h +++ b/include/fastrtps/subscriber/SubscriberListener.h @@ -19,7 +19,7 @@ #ifndef SUBLISTENER_H_ #define SUBLISTENER_H_ -#include +#include #include #include @@ -35,7 +35,7 @@ class Subscriber; /** * Class SubscriberListener, it should be used by the end user to implement specific callbacks to certain actions. */ -class RTPS_DllAPI SubscriberListener +class FASTDDS_EXPORTED_API SubscriberListener { public: diff --git a/include/fastrtps/types/AnnotationParameterValue.h b/include/fastrtps/types/AnnotationParameterValue.h index e4cbd96dd48..ec09b7f6e52 100644 --- a/include/fastrtps/types/AnnotationParameterValue.h +++ b/include/fastrtps/types/AnnotationParameterValue.h @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include @@ -68,39 +68,39 @@ class ExtendedAnnotationParameterValue /*! * @brief Default constructor. */ - RTPS_DllAPI ExtendedAnnotationParameterValue(); + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~ExtendedAnnotationParameterValue(); + FASTDDS_EXPORTED_API ~ExtendedAnnotationParameterValue(); /*! * @brief Copy constructor. * @param x Reference to the object ExtendedAnnotationParameterValue that will be copied. */ - RTPS_DllAPI ExtendedAnnotationParameterValue( + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue( const ExtendedAnnotationParameterValue& x); /*! * @brief Move constructor. * @param x Reference to the object ExtendedAnnotationParameterValue that will be copied. */ - RTPS_DllAPI ExtendedAnnotationParameterValue( + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue( ExtendedAnnotationParameterValue&& x); /*! * @brief Copy assignment. * @param x Reference to the object ExtendedAnnotationParameterValue that will be copied. */ - RTPS_DllAPI ExtendedAnnotationParameterValue& operator =( + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue& operator =( const ExtendedAnnotationParameterValue& x); /*! * @brief Move assignment. * @param x Reference to the object ExtendedAnnotationParameterValue that will be copied. */ - RTPS_DllAPI ExtendedAnnotationParameterValue& operator =( + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue& operator =( ExtendedAnnotationParameterValue&& x); /*! @@ -109,22 +109,22 @@ class ExtendedAnnotationParameterValue * @param current_alignment Buffer alignment. * @return Maximum serialized size. */ - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); /*! * @brief This function tells you if the Key has been defined for this type */ - RTPS_DllAPI static bool isKeyDefined(); + FASTDDS_EXPORTED_API static bool isKeyDefined(); /*! * @brief This function serializes the key members of an object using CDR serialization. * @param cdr CDR serialization object. */ - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const ExtendedAnnotationParameterValue&) const { return true; @@ -143,39 +143,39 @@ class AnnotationParameterValue /*! * @brief Default constructor. */ - RTPS_DllAPI AnnotationParameterValue(); + FASTDDS_EXPORTED_API AnnotationParameterValue(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~AnnotationParameterValue(); + FASTDDS_EXPORTED_API ~AnnotationParameterValue(); /*! * @brief Copy constructor. * @param x Reference to the object AnnotationParameterValue that will be copied. */ - RTPS_DllAPI AnnotationParameterValue( + FASTDDS_EXPORTED_API AnnotationParameterValue( const AnnotationParameterValue& x); /*! * @brief Move constructor. * @param x Reference to the object AnnotationParameterValue that will be copied. */ - RTPS_DllAPI AnnotationParameterValue( + FASTDDS_EXPORTED_API AnnotationParameterValue( AnnotationParameterValue&& x); /*! * @brief Copy assignment. * @param x Reference to the object AnnotationParameterValue that will be copied. */ - RTPS_DllAPI AnnotationParameterValue& operator =( + FASTDDS_EXPORTED_API AnnotationParameterValue& operator =( const AnnotationParameterValue& x); /*! * @brief Move assignment. * @param x Reference to the object AnnotationParameterValue that will be copied. */ - RTPS_DllAPI AnnotationParameterValue& operator =( + FASTDDS_EXPORTED_API AnnotationParameterValue& operator =( AnnotationParameterValue&& x); /*! @@ -183,26 +183,26 @@ class AnnotationParameterValue * @param __d New value for the discriminator. * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( char __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - RTPS_DllAPI char _d() const; + FASTDDS_EXPORTED_API char _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - RTPS_DllAPI char& _d(); + FASTDDS_EXPORTED_API char& _d(); /*! * @brief This function sets a value in member boolean_value * @param _boolean_value New value for member boolean_value */ - RTPS_DllAPI void boolean_value( + FASTDDS_EXPORTED_API void boolean_value( bool _boolean_value); /*! @@ -210,19 +210,19 @@ class AnnotationParameterValue * @return Value of member boolean_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI bool boolean_value() const; + FASTDDS_EXPORTED_API bool boolean_value() const; /*! * @brief This function returns a reference to member boolean_value * @return Reference to member boolean_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI bool& boolean_value(); + FASTDDS_EXPORTED_API bool& boolean_value(); /*! * @brief This function sets a value in member byte_value * @param _byte_value New value for member byte_value */ - RTPS_DllAPI void byte_value( + FASTDDS_EXPORTED_API void byte_value( uint8_t _byte_value); /*! @@ -230,19 +230,19 @@ class AnnotationParameterValue * @return Value of member byte_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint8_t byte_value() const; + FASTDDS_EXPORTED_API uint8_t byte_value() const; /*! * @brief This function returns a reference to member byte_value * @return Reference to member byte_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint8_t& byte_value(); + FASTDDS_EXPORTED_API uint8_t& byte_value(); /*! * @brief This function sets a value in member int16_value * @param _int16_value New value for member int16_value */ - RTPS_DllAPI void int16_value( + FASTDDS_EXPORTED_API void int16_value( int16_t _int16_value); /*! @@ -250,19 +250,19 @@ class AnnotationParameterValue * @return Value of member int16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int16_t int16_value() const; + FASTDDS_EXPORTED_API int16_t int16_value() const; /*! * @brief This function returns a reference to member int16_value * @return Reference to member int16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int16_t& int16_value(); + FASTDDS_EXPORTED_API int16_t& int16_value(); /*! * @brief This function sets a value in member uint_16_value * @param _uint_16_value New value for member uint_16_value */ - RTPS_DllAPI void uint_16_value( + FASTDDS_EXPORTED_API void uint_16_value( uint16_t _uint_16_value); /*! @@ -270,19 +270,19 @@ class AnnotationParameterValue * @return Value of member uint_16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint16_t uint_16_value() const; + FASTDDS_EXPORTED_API uint16_t uint_16_value() const; /*! * @brief This function returns a reference to member uint_16_value * @return Reference to member uint_16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint16_t& uint_16_value(); + FASTDDS_EXPORTED_API uint16_t& uint_16_value(); /*! * @brief This function sets a value in member int32_value * @param _int32_value New value for member int32_value */ - RTPS_DllAPI void int32_value( + FASTDDS_EXPORTED_API void int32_value( int32_t _int32_value); /*! @@ -290,19 +290,19 @@ class AnnotationParameterValue * @return Value of member int32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int32_t int32_value() const; + FASTDDS_EXPORTED_API int32_t int32_value() const; /*! * @brief This function returns a reference to member int32_value * @return Reference to member int32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int32_t& int32_value(); + FASTDDS_EXPORTED_API int32_t& int32_value(); /*! * @brief This function sets a value in member uint32_value * @param _uint32_value New value for member uint32_value */ - RTPS_DllAPI void uint32_value( + FASTDDS_EXPORTED_API void uint32_value( uint32_t _uint32_value); /*! @@ -310,19 +310,19 @@ class AnnotationParameterValue * @return Value of member uint32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint32_t uint32_value() const; + FASTDDS_EXPORTED_API uint32_t uint32_value() const; /*! * @brief This function returns a reference to member uint32_value * @return Reference to member uint32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint32_t& uint32_value(); + FASTDDS_EXPORTED_API uint32_t& uint32_value(); /*! * @brief This function sets a value in member int64_value * @param _int64_value New value for member int64_value */ - RTPS_DllAPI void int64_value( + FASTDDS_EXPORTED_API void int64_value( int64_t _int64_value); /*! @@ -330,20 +330,20 @@ class AnnotationParameterValue * @return Value of member int64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int64_t int64_value() const; + FASTDDS_EXPORTED_API int64_t int64_value() const; /*! * @brief This function returns a reference to member int64_value * @return Reference to member int64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int64_t& int64_value(); + FASTDDS_EXPORTED_API int64_t& int64_value(); /*! * @brief This function sets a value in member uint64_value * @param _uint64_value New value for member uint64_value */ - RTPS_DllAPI void uint64_value( + FASTDDS_EXPORTED_API void uint64_value( uint64_t _uint64_value); /*! @@ -351,19 +351,19 @@ class AnnotationParameterValue * @return Value of member uint64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint64_t uint64_value() const; + FASTDDS_EXPORTED_API uint64_t uint64_value() const; /*! * @brief This function returns a reference to member uint64_value * @return Reference to member uint64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI uint64_t& uint64_value(); + FASTDDS_EXPORTED_API uint64_t& uint64_value(); /*! * @brief This function sets a value in member float32_value * @param _float32_value New value for member float32_value */ - RTPS_DllAPI void float32_value( + FASTDDS_EXPORTED_API void float32_value( float _float32_value); /*! @@ -371,19 +371,19 @@ class AnnotationParameterValue * @return Value of member float32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI float float32_value() const; + FASTDDS_EXPORTED_API float float32_value() const; /*! * @brief This function returns a reference to member float32_value * @return Reference to member float32_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI float& float32_value(); + FASTDDS_EXPORTED_API float& float32_value(); /*! * @brief This function sets a value in member float64_value * @param _float64_value New value for member float64_value */ - RTPS_DllAPI void float64_value( + FASTDDS_EXPORTED_API void float64_value( double _float64_value); /*! @@ -391,20 +391,20 @@ class AnnotationParameterValue * @return Value of member float64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI double float64_value() const; + FASTDDS_EXPORTED_API double float64_value() const; /*! * @brief This function returns a reference to member float64_value * @return Reference to member float64_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI double& float64_value(); + FASTDDS_EXPORTED_API double& float64_value(); /*! * @brief This function sets a value in member float128_value * @param _float128_value New value for member float128_value */ - RTPS_DllAPI void float128_value( + FASTDDS_EXPORTED_API void float128_value( long double _float128_value); /*! @@ -412,19 +412,19 @@ class AnnotationParameterValue * @return Value of member float128_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI long double float128_value() const; + FASTDDS_EXPORTED_API long double float128_value() const; /*! * @brief This function returns a reference to member float128_value * @return Reference to member float128_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI long double& float128_value(); + FASTDDS_EXPORTED_API long double& float128_value(); /*! * @brief This function sets a value in member char_value * @param _char_value New value for member char_value */ - RTPS_DllAPI void char_value( + FASTDDS_EXPORTED_API void char_value( char _char_value); /*! @@ -432,19 +432,19 @@ class AnnotationParameterValue * @return Value of member char_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI char char_value() const; + FASTDDS_EXPORTED_API char char_value() const; /*! * @brief This function returns a reference to member char_value * @return Reference to member char_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI char& char_value(); + FASTDDS_EXPORTED_API char& char_value(); /*! * @brief This function sets a value in member wchar_value * @param _wchar_value New value for member wchar_value */ - RTPS_DllAPI void wchar_value( + FASTDDS_EXPORTED_API void wchar_value( wchar_t _wchar_value); /*! @@ -452,19 +452,19 @@ class AnnotationParameterValue * @return Value of member wchar_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI wchar_t wchar_value() const; + FASTDDS_EXPORTED_API wchar_t wchar_value() const; /*! * @brief This function returns a reference to member wchar_value * @return Reference to member wchar_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI wchar_t& wchar_value(); + FASTDDS_EXPORTED_API wchar_t& wchar_value(); /*! * @brief This function sets a value in member enumerated_value * @param _enumerated_value New value for member enumerated_value */ - RTPS_DllAPI void enumerated_value( + FASTDDS_EXPORTED_API void enumerated_value( int32_t _enumerated_value); /*! @@ -472,26 +472,26 @@ class AnnotationParameterValue * @return Value of member enumerated_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int32_t enumerated_value() const; + FASTDDS_EXPORTED_API int32_t enumerated_value() const; /*! * @brief This function returns a reference to member enumerated_value * @return Reference to member enumerated_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI int32_t& enumerated_value(); + FASTDDS_EXPORTED_API int32_t& enumerated_value(); /*! * @brief This function copies the value in member string8_value * @param _string8_value New value to be copied in member string8_value */ - RTPS_DllAPI void string8_value( + FASTDDS_EXPORTED_API void string8_value( const std::string& _string8_value); /*! * @brief This function moves the value in member string8_value * @param _string8_value New value to be moved in member string8_value */ - RTPS_DllAPI void string8_value( + FASTDDS_EXPORTED_API void string8_value( std::string&& _string8_value); /*! @@ -499,26 +499,26 @@ class AnnotationParameterValue * @return Constant reference to member string8_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const std::string& string8_value() const; + FASTDDS_EXPORTED_API const std::string& string8_value() const; /*! * @brief This function returns a reference to member string8_value * @return Reference to member string8_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI std::string& string8_value(); + FASTDDS_EXPORTED_API std::string& string8_value(); /*! * @brief This function copies the value in member string16_value * @param _string16_value New value to be copied in member string16_value */ - RTPS_DllAPI void string16_value( + FASTDDS_EXPORTED_API void string16_value( const std::wstring& _string16_value); /*! * @brief This function moves the value in member string16_value * @param _string16_value New value to be moved in member string16_value */ - RTPS_DllAPI void string16_value( + FASTDDS_EXPORTED_API void string16_value( std::wstring&& _string16_value); /*! @@ -526,27 +526,27 @@ class AnnotationParameterValue * @return Constant reference to member string16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const std::wstring& string16_value() const; + FASTDDS_EXPORTED_API const std::wstring& string16_value() const; /*! * @brief This function returns a reference to member string16_value * @return Reference to member string16_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI std::wstring& string16_value(); + FASTDDS_EXPORTED_API std::wstring& string16_value(); /*! * @brief This function copies the value in member extended_value * @param _extended_value New value to be copied in member extended_value */ - RTPS_DllAPI void extended_value( + FASTDDS_EXPORTED_API void extended_value( const ExtendedAnnotationParameterValue& _extended_value); /*! * @brief This function moves the value in member extended_value * @param _extended_value New value to be moved in member extended_value */ - RTPS_DllAPI void extended_value( + FASTDDS_EXPORTED_API void extended_value( ExtendedAnnotationParameterValue&& _extended_value); /*! @@ -554,14 +554,14 @@ class AnnotationParameterValue * @return Constant reference to member extended_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const ExtendedAnnotationParameterValue& extended_value() const; + FASTDDS_EXPORTED_API const ExtendedAnnotationParameterValue& extended_value() const; /*! * @brief This function returns a reference to member extended_value * @return Reference to member extended_value * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI ExtendedAnnotationParameterValue& extended_value(); + FASTDDS_EXPORTED_API ExtendedAnnotationParameterValue& extended_value(); /*! * @brief This function returns the maximum serialized size of the Key of an object @@ -569,28 +569,28 @@ class AnnotationParameterValue * @param current_alignment Buffer alignment. * @return Maximum serialized size. */ - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); /*! * @brief This function tells you if the Key has been defined for this type */ - RTPS_DllAPI static bool isKeyDefined(); + FASTDDS_EXPORTED_API static bool isKeyDefined(); /*! * @brief This function serializes the key members of an object using CDR serialization. * @param cdr CDR serialization object. */ - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AnnotationParameterValue& other) const; /** * Aux method to return value as its string representation. */ - RTPS_DllAPI std::string to_string() const + FASTDDS_EXPORTED_API std::string to_string() const { switch (m__d) { @@ -637,7 +637,7 @@ class AnnotationParameterValue /** * Aux method to set value from its string representation. */ - RTPS_DllAPI void from_string( + FASTDDS_EXPORTED_API void from_string( const std::string& value) { switch (m__d) @@ -769,39 +769,39 @@ class AppliedAnnotationParameter /*! * @brief Default constructor. */ - RTPS_DllAPI AppliedAnnotationParameter(); + FASTDDS_EXPORTED_API AppliedAnnotationParameter(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~AppliedAnnotationParameter(); + FASTDDS_EXPORTED_API ~AppliedAnnotationParameter(); /*! * @brief Copy constructor. * @param x Reference to the object AppliedAnnotationParameter that will be copied. */ - RTPS_DllAPI AppliedAnnotationParameter( + FASTDDS_EXPORTED_API AppliedAnnotationParameter( const AppliedAnnotationParameter& x); /*! * @brief Move constructor. * @param x Reference to the object AppliedAnnotationParameter that will be copied. */ - RTPS_DllAPI AppliedAnnotationParameter( + FASTDDS_EXPORTED_API AppliedAnnotationParameter( AppliedAnnotationParameter&& x); /*! * @brief Copy assignment. * @param x Reference to the object AppliedAnnotationParameter that will be copied. */ - RTPS_DllAPI AppliedAnnotationParameter& operator =( + FASTDDS_EXPORTED_API AppliedAnnotationParameter& operator =( const AppliedAnnotationParameter& x); /*! * @brief Move assignment. * @param x Reference to the object AppliedAnnotationParameter that will be copied. */ - RTPS_DllAPI AppliedAnnotationParameter& operator =( + FASTDDS_EXPORTED_API AppliedAnnotationParameter& operator =( AppliedAnnotationParameter&& x); /*! @@ -886,22 +886,22 @@ class AppliedAnnotationParameter * @param current_alignment Buffer alignment. * @return Maximum serialized size. */ - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); /*! * @brief This function tells you if the Key has been defined for this type */ - RTPS_DllAPI static bool isKeyDefined(); + FASTDDS_EXPORTED_API static bool isKeyDefined(); /*! * @brief This function serializes the key members of an object using CDR serialization. * @param cdr CDR serialization object. */ - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AppliedAnnotationParameter& other) const; private: @@ -960,18 +960,18 @@ class AppliedAnnotation { public: - RTPS_DllAPI AppliedAnnotation(); + FASTDDS_EXPORTED_API AppliedAnnotation(); - RTPS_DllAPI ~AppliedAnnotation(); + FASTDDS_EXPORTED_API ~AppliedAnnotation(); - RTPS_DllAPI AppliedAnnotation( + FASTDDS_EXPORTED_API AppliedAnnotation( const AppliedAnnotation& x); - RTPS_DllAPI AppliedAnnotation( + FASTDDS_EXPORTED_API AppliedAnnotation( AppliedAnnotation&& x); - RTPS_DllAPI AppliedAnnotation& operator =( + FASTDDS_EXPORTED_API AppliedAnnotation& operator =( const AppliedAnnotation& x); - RTPS_DllAPI AppliedAnnotation& operator =( + FASTDDS_EXPORTED_API AppliedAnnotation& operator =( AppliedAnnotation&& x); inline void annotation_typeid( @@ -1018,13 +1018,13 @@ class AppliedAnnotation return m_param_seq; } - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); - RTPS_DllAPI static bool isKeyDefined(); - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API static bool isKeyDefined(); + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AppliedAnnotation& other) const; private: @@ -1046,20 +1046,20 @@ class AppliedVerbatimAnnotation { public: - RTPS_DllAPI AppliedVerbatimAnnotation(); + FASTDDS_EXPORTED_API AppliedVerbatimAnnotation(); - RTPS_DllAPI ~AppliedVerbatimAnnotation(); + FASTDDS_EXPORTED_API ~AppliedVerbatimAnnotation(); - RTPS_DllAPI AppliedVerbatimAnnotation( + FASTDDS_EXPORTED_API AppliedVerbatimAnnotation( const AppliedVerbatimAnnotation& x); - RTPS_DllAPI AppliedVerbatimAnnotation( + FASTDDS_EXPORTED_API AppliedVerbatimAnnotation( AppliedVerbatimAnnotation&& x); - RTPS_DllAPI AppliedVerbatimAnnotation& operator =( + FASTDDS_EXPORTED_API AppliedVerbatimAnnotation& operator =( const AppliedVerbatimAnnotation& x); - RTPS_DllAPI AppliedVerbatimAnnotation& operator =( + FASTDDS_EXPORTED_API AppliedVerbatimAnnotation& operator =( AppliedVerbatimAnnotation&& x); inline void placement( @@ -1128,15 +1128,15 @@ class AppliedVerbatimAnnotation return m_text; } - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); - RTPS_DllAPI static bool isKeyDefined(); + FASTDDS_EXPORTED_API static bool isKeyDefined(); - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AppliedVerbatimAnnotation& other) const; private: @@ -1158,20 +1158,20 @@ class AppliedBuiltinMemberAnnotations { public: - RTPS_DllAPI AppliedBuiltinMemberAnnotations(); + FASTDDS_EXPORTED_API AppliedBuiltinMemberAnnotations(); - RTPS_DllAPI ~AppliedBuiltinMemberAnnotations(); + FASTDDS_EXPORTED_API ~AppliedBuiltinMemberAnnotations(); - RTPS_DllAPI AppliedBuiltinMemberAnnotations( + FASTDDS_EXPORTED_API AppliedBuiltinMemberAnnotations( const AppliedBuiltinMemberAnnotations& x); - RTPS_DllAPI AppliedBuiltinMemberAnnotations( + FASTDDS_EXPORTED_API AppliedBuiltinMemberAnnotations( AppliedBuiltinMemberAnnotations&& x); - RTPS_DllAPI AppliedBuiltinMemberAnnotations& operator =( + FASTDDS_EXPORTED_API AppliedBuiltinMemberAnnotations& operator =( const AppliedBuiltinMemberAnnotations& x); - RTPS_DllAPI AppliedBuiltinMemberAnnotations& operator =( + FASTDDS_EXPORTED_API AppliedBuiltinMemberAnnotations& operator =( AppliedBuiltinMemberAnnotations&& x); inline void unit( @@ -1262,15 +1262,15 @@ class AppliedBuiltinMemberAnnotations return m_hash_id; } - RTPS_DllAPI static size_t getKeyMaxCdrSerializedSize( + FASTDDS_EXPORTED_API static size_t getKeyMaxCdrSerializedSize( size_t current_alignment = 0); - RTPS_DllAPI static bool isKeyDefined(); + FASTDDS_EXPORTED_API static bool isKeyDefined(); - RTPS_DllAPI void serializeKey( + FASTDDS_EXPORTED_API void serializeKey( eprosima::fastcdr::Cdr& cdr) const; - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AppliedBuiltinMemberAnnotations& other) const; private: diff --git a/include/fastrtps/types/DynamicData.h b/include/fastrtps/types/DynamicData.h index 6020b46105f..855fc3d1b4e 100644 --- a/include/fastrtps/types/DynamicData.h +++ b/include/fastrtps/types/DynamicData.h @@ -179,255 +179,255 @@ class DynamicData public: - RTPS_DllAPI ReturnCode_t get_descriptor( + FASTDDS_EXPORTED_API ReturnCode_t get_descriptor( MemberDescriptor& value, MemberId id); - RTPS_DllAPI ReturnCode_t set_descriptor( + FASTDDS_EXPORTED_API ReturnCode_t set_descriptor( MemberId id, const MemberDescriptor* value); - RTPS_DllAPI ReturnCode_t clear_all_values(); + FASTDDS_EXPORTED_API ReturnCode_t clear_all_values(); - RTPS_DllAPI ReturnCode_t clear_nonkey_values(); + FASTDDS_EXPORTED_API ReturnCode_t clear_nonkey_values(); - RTPS_DllAPI ReturnCode_t clear_value( + FASTDDS_EXPORTED_API ReturnCode_t clear_value( MemberId id); - RTPS_DllAPI bool equals( + FASTDDS_EXPORTED_API bool equals( const DynamicData* other) const; - RTPS_DllAPI TypeKind get_kind() const; + FASTDDS_EXPORTED_API TypeKind get_kind() const; - RTPS_DllAPI uint32_t get_item_count() const; + FASTDDS_EXPORTED_API uint32_t get_item_count() const; - RTPS_DllAPI std::string get_name(); + FASTDDS_EXPORTED_API std::string get_name(); - RTPS_DllAPI MemberId get_member_id_by_name( + FASTDDS_EXPORTED_API MemberId get_member_id_by_name( const std::string& name) const; - RTPS_DllAPI MemberId get_member_id_at_index( + FASTDDS_EXPORTED_API MemberId get_member_id_at_index( uint32_t index) const; - RTPS_DllAPI DynamicData* loan_value( + FASTDDS_EXPORTED_API DynamicData* loan_value( MemberId id); - RTPS_DllAPI ReturnCode_t return_loaned_value( + FASTDDS_EXPORTED_API ReturnCode_t return_loaned_value( const DynamicData* value); - RTPS_DllAPI MemberId get_array_index( + FASTDDS_EXPORTED_API MemberId get_array_index( const std::vector& position); - RTPS_DllAPI ReturnCode_t insert_sequence_data( + FASTDDS_EXPORTED_API ReturnCode_t insert_sequence_data( MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_int32_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_int32_value( int32_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_uint32_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_uint32_value( uint32_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_int16_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_int16_value( int16_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_uint16_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_uint16_value( uint16_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_int64_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_int64_value( int64_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_uint64_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_uint64_value( uint64_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_float32_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_float32_value( float value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_float64_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_float64_value( double value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_float128_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_float128_value( long double value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_char8_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_char8_value( char value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_char16_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_char16_value( wchar_t value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_byte_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_byte_value( octet value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_bool_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_bool_value( bool value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_string_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_string_value( const std::string& value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_wstring_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_wstring_value( const std::wstring& value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_enum_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_enum_value( const std::string& value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_complex_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_complex_value( const DynamicData* value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_complex_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_complex_value( DynamicData* value, MemberId& outId); - RTPS_DllAPI ReturnCode_t insert_complex_value( + FASTDDS_EXPORTED_API ReturnCode_t insert_complex_value( DynamicData_ptr value, MemberId& outId); - RTPS_DllAPI ReturnCode_t remove_sequence_data( + FASTDDS_EXPORTED_API ReturnCode_t remove_sequence_data( MemberId id); - RTPS_DllAPI ReturnCode_t clear_data(); + FASTDDS_EXPORTED_API ReturnCode_t clear_data(); - RTPS_DllAPI ReturnCode_t clear_array_data( + FASTDDS_EXPORTED_API ReturnCode_t clear_array_data( MemberId indexId); - RTPS_DllAPI ReturnCode_t insert_map_data( + FASTDDS_EXPORTED_API ReturnCode_t insert_map_data( const DynamicData* key, MemberId& outKeyId, MemberId& outValueId); - RTPS_DllAPI ReturnCode_t insert_map_data( + FASTDDS_EXPORTED_API ReturnCode_t insert_map_data( const DynamicData* key, DynamicData* value, MemberId& outKey, MemberId& outValue); - RTPS_DllAPI ReturnCode_t insert_map_data( + FASTDDS_EXPORTED_API ReturnCode_t insert_map_data( const DynamicData* key, const DynamicData* value, MemberId& outKey, MemberId& outValue); - RTPS_DllAPI ReturnCode_t insert_map_data( + FASTDDS_EXPORTED_API ReturnCode_t insert_map_data( const DynamicData* key, DynamicData_ptr value, MemberId& outKey, MemberId& outValue); - RTPS_DllAPI ReturnCode_t remove_map_data( + FASTDDS_EXPORTED_API ReturnCode_t remove_map_data( MemberId keyId); - RTPS_DllAPI ReturnCode_t get_int32_value( + FASTDDS_EXPORTED_API ReturnCode_t get_int32_value( int32_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_int32_value( + FASTDDS_EXPORTED_API ReturnCode_t set_int32_value( int32_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_uint32_value( + FASTDDS_EXPORTED_API ReturnCode_t get_uint32_value( uint32_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_uint32_value( + FASTDDS_EXPORTED_API ReturnCode_t set_uint32_value( uint32_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_int16_value( + FASTDDS_EXPORTED_API ReturnCode_t get_int16_value( int16_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_int16_value( + FASTDDS_EXPORTED_API ReturnCode_t set_int16_value( int16_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_uint16_value( + FASTDDS_EXPORTED_API ReturnCode_t get_uint16_value( uint16_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_uint16_value( + FASTDDS_EXPORTED_API ReturnCode_t set_uint16_value( uint16_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_int64_value( + FASTDDS_EXPORTED_API ReturnCode_t get_int64_value( int64_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_int64_value( + FASTDDS_EXPORTED_API ReturnCode_t set_int64_value( int64_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_uint64_value( + FASTDDS_EXPORTED_API ReturnCode_t get_uint64_value( uint64_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_uint64_value( + FASTDDS_EXPORTED_API ReturnCode_t set_uint64_value( uint64_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_float32_value( + FASTDDS_EXPORTED_API ReturnCode_t get_float32_value( float& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_float32_value( + FASTDDS_EXPORTED_API ReturnCode_t set_float32_value( float value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_float64_value( + FASTDDS_EXPORTED_API ReturnCode_t get_float64_value( double& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_float64_value( + FASTDDS_EXPORTED_API ReturnCode_t set_float64_value( double value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_float128_value( + FASTDDS_EXPORTED_API ReturnCode_t get_float128_value( long double& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_float128_value( + FASTDDS_EXPORTED_API ReturnCode_t set_float128_value( long double value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_char8_value( + FASTDDS_EXPORTED_API ReturnCode_t get_char8_value( char& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_char8_value( + FASTDDS_EXPORTED_API ReturnCode_t set_char8_value( char value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_char16_value( + FASTDDS_EXPORTED_API ReturnCode_t get_char16_value( wchar_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_char16_value( + FASTDDS_EXPORTED_API ReturnCode_t set_char16_value( wchar_t value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_byte_value( + FASTDDS_EXPORTED_API ReturnCode_t get_byte_value( octet& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_byte_value( + FASTDDS_EXPORTED_API ReturnCode_t set_byte_value( octet value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_int8_value( + FASTDDS_EXPORTED_API ReturnCode_t get_int8_value( int8_t& value, MemberId id) const { @@ -437,14 +437,14 @@ class DynamicData return result; } - RTPS_DllAPI ReturnCode_t set_int8_value( + FASTDDS_EXPORTED_API ReturnCode_t set_int8_value( int8_t value, MemberId id = MEMBER_ID_INVALID) { return set_byte_value(static_cast(value), id); } - RTPS_DllAPI ReturnCode_t get_uint8_value( + FASTDDS_EXPORTED_API ReturnCode_t get_uint8_value( uint8_t& value, MemberId id) const { @@ -454,22 +454,22 @@ class DynamicData return result; } - RTPS_DllAPI ReturnCode_t set_uint8_value( + FASTDDS_EXPORTED_API ReturnCode_t set_uint8_value( uint8_t value, MemberId id = MEMBER_ID_INVALID) { return set_byte_value(static_cast(value), id); } - RTPS_DllAPI ReturnCode_t get_bool_value( + FASTDDS_EXPORTED_API ReturnCode_t get_bool_value( bool& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_bool_value( + FASTDDS_EXPORTED_API ReturnCode_t set_bool_value( bool value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t set_bool_value( + FASTDDS_EXPORTED_API ReturnCode_t set_bool_value( bool value, const std::string& name) { @@ -481,42 +481,42 @@ class DynamicData return ReturnCode_t::RETCODE_BAD_PARAMETER; } - RTPS_DllAPI ReturnCode_t get_string_value( + FASTDDS_EXPORTED_API ReturnCode_t get_string_value( std::string& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_string_value( + FASTDDS_EXPORTED_API ReturnCode_t set_string_value( const std::string& value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_wstring_value( + FASTDDS_EXPORTED_API ReturnCode_t get_wstring_value( std::wstring& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_wstring_value( + FASTDDS_EXPORTED_API ReturnCode_t set_wstring_value( const std::wstring& value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_enum_value( + FASTDDS_EXPORTED_API ReturnCode_t get_enum_value( std::string& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_enum_value( + FASTDDS_EXPORTED_API ReturnCode_t set_enum_value( const std::string& value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_enum_value( + FASTDDS_EXPORTED_API ReturnCode_t get_enum_value( uint32_t& value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_enum_value( + FASTDDS_EXPORTED_API ReturnCode_t set_enum_value( const uint32_t& value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_bitmask_value( + FASTDDS_EXPORTED_API ReturnCode_t get_bitmask_value( uint64_t& value) const; - RTPS_DllAPI uint64_t get_bitmask_value() const + FASTDDS_EXPORTED_API uint64_t get_bitmask_value() const { uint64_t value; if (get_bitmask_value(value) != ReturnCode_t::RETCODE_OK) @@ -526,22 +526,22 @@ class DynamicData return value; } - RTPS_DllAPI ReturnCode_t set_bitmask_value( + FASTDDS_EXPORTED_API ReturnCode_t set_bitmask_value( uint64_t value); - RTPS_DllAPI ReturnCode_t get_complex_value( + FASTDDS_EXPORTED_API ReturnCode_t get_complex_value( DynamicData** value, MemberId id) const; - RTPS_DllAPI ReturnCode_t set_complex_value( + FASTDDS_EXPORTED_API ReturnCode_t set_complex_value( DynamicData* value, MemberId id = MEMBER_ID_INVALID); - RTPS_DllAPI ReturnCode_t get_union_label( + FASTDDS_EXPORTED_API ReturnCode_t get_union_label( uint64_t& value) const; // Basic types returns (copy) - RTPS_DllAPI int32_t get_int32_value( + FASTDDS_EXPORTED_API int32_t get_int32_value( MemberId id) const { int32_t value; @@ -552,7 +552,7 @@ class DynamicData return value; } - RTPS_DllAPI uint32_t get_uint32_value( + FASTDDS_EXPORTED_API uint32_t get_uint32_value( MemberId id) const { uint32_t value; @@ -563,7 +563,7 @@ class DynamicData return value; } - RTPS_DllAPI int16_t get_int16_value( + FASTDDS_EXPORTED_API int16_t get_int16_value( MemberId id) const { int16_t value; @@ -574,7 +574,7 @@ class DynamicData return value; } - RTPS_DllAPI uint16_t get_uint16_value( + FASTDDS_EXPORTED_API uint16_t get_uint16_value( MemberId id) const { uint16_t value; @@ -585,7 +585,7 @@ class DynamicData return value; } - RTPS_DllAPI int64_t get_int64_value( + FASTDDS_EXPORTED_API int64_t get_int64_value( MemberId id) const { int64_t value; @@ -596,7 +596,7 @@ class DynamicData return value; } - RTPS_DllAPI uint64_t get_uint64_value( + FASTDDS_EXPORTED_API uint64_t get_uint64_value( MemberId id) const { uint64_t value; @@ -607,7 +607,7 @@ class DynamicData return value; } - RTPS_DllAPI float get_float32_value( + FASTDDS_EXPORTED_API float get_float32_value( MemberId id) const { float value; @@ -618,7 +618,7 @@ class DynamicData return value; } - RTPS_DllAPI double get_float64_value( + FASTDDS_EXPORTED_API double get_float64_value( MemberId id) const { double value; @@ -629,7 +629,7 @@ class DynamicData return value; } - RTPS_DllAPI long double get_float128_value( + FASTDDS_EXPORTED_API long double get_float128_value( MemberId id) const { long double value; @@ -640,7 +640,7 @@ class DynamicData return value; } - RTPS_DllAPI char get_char8_value( + FASTDDS_EXPORTED_API char get_char8_value( MemberId id) const { char value; @@ -651,7 +651,7 @@ class DynamicData return value; } - RTPS_DllAPI wchar_t get_char16_value( + FASTDDS_EXPORTED_API wchar_t get_char16_value( MemberId id) const { wchar_t value; @@ -662,7 +662,7 @@ class DynamicData return value; } - RTPS_DllAPI octet get_byte_value( + FASTDDS_EXPORTED_API octet get_byte_value( MemberId id) const { octet value; @@ -673,7 +673,7 @@ class DynamicData return value; } - RTPS_DllAPI int8_t get_int8_value( + FASTDDS_EXPORTED_API int8_t get_int8_value( MemberId id) const { int8_t value; @@ -684,7 +684,7 @@ class DynamicData return value; } - RTPS_DllAPI uint8_t get_uint8_value( + FASTDDS_EXPORTED_API uint8_t get_uint8_value( MemberId id) const { uint8_t value; @@ -695,7 +695,7 @@ class DynamicData return value; } - RTPS_DllAPI bool get_bool_value( + FASTDDS_EXPORTED_API bool get_bool_value( MemberId id) const { bool value; @@ -706,7 +706,7 @@ class DynamicData return value; } - RTPS_DllAPI bool get_bool_value( + FASTDDS_EXPORTED_API bool get_bool_value( const std::string& name) const { MemberId id = get_member_id_by_name(name); @@ -718,7 +718,7 @@ class DynamicData return value; } - RTPS_DllAPI std::string get_string_value( + FASTDDS_EXPORTED_API std::string get_string_value( MemberId id) const { std::string value; @@ -729,7 +729,7 @@ class DynamicData return value; } - RTPS_DllAPI std::wstring get_wstring_value( + FASTDDS_EXPORTED_API std::wstring get_wstring_value( MemberId id) const { std::wstring value; @@ -740,7 +740,7 @@ class DynamicData return value; } - RTPS_DllAPI std::string get_enum_value( + FASTDDS_EXPORTED_API std::string get_enum_value( MemberId id) const { std::string value; @@ -751,7 +751,7 @@ class DynamicData return value; } - RTPS_DllAPI uint64_t get_union_label() const + FASTDDS_EXPORTED_API uint64_t get_union_label() const { uint64_t value; if (get_union_label(value) != ReturnCode_t::RETCODE_OK) @@ -761,18 +761,18 @@ class DynamicData return value; } - RTPS_DllAPI uint64_t get_discriminator_value() const + FASTDDS_EXPORTED_API uint64_t get_discriminator_value() const { return discriminator_value_; } - RTPS_DllAPI void get_discriminator_value( + FASTDDS_EXPORTED_API void get_discriminator_value( uint64_t& outValue) const { outValue = discriminator_value_; } - RTPS_DllAPI void set_discriminator_value( + FASTDDS_EXPORTED_API void set_discriminator_value( uint64_t value) { discriminator_value_ = value; diff --git a/include/fastrtps/types/DynamicDataFactory.h b/include/fastrtps/types/DynamicDataFactory.h index db87510f51a..a5ea5b6837a 100644 --- a/include/fastrtps/types/DynamicDataFactory.h +++ b/include/fastrtps/types/DynamicDataFactory.h @@ -31,6 +31,7 @@ namespace types { class DynamicDataFactory { protected: + DynamicDataFactory(); ReturnCode_t create_members( @@ -40,24 +41,29 @@ class DynamicDataFactory #ifndef DISABLE_DYNAMIC_MEMORY_CHECK std::vector dynamic_datas_; mutable std::recursive_mutex mutex_; -#endif +#endif // ifndef DISABLE_DYNAMIC_MEMORY_CHECK public: + ~DynamicDataFactory(); - RTPS_DllAPI static DynamicDataFactory* get_instance(); + FASTDDS_EXPORTED_API static DynamicDataFactory* get_instance(); - RTPS_DllAPI static ReturnCode_t delete_instance(); + FASTDDS_EXPORTED_API static ReturnCode_t delete_instance(); - RTPS_DllAPI DynamicData* create_data(DynamicTypeBuilder* pBuilder); + FASTDDS_EXPORTED_API DynamicData* create_data( + DynamicTypeBuilder* pBuilder); - RTPS_DllAPI DynamicData* create_data(DynamicType_ptr pType); + FASTDDS_EXPORTED_API DynamicData* create_data( + DynamicType_ptr pType); - RTPS_DllAPI DynamicData* create_copy(const DynamicData* pData); + FASTDDS_EXPORTED_API DynamicData* create_copy( + const DynamicData* pData); - RTPS_DllAPI ReturnCode_t delete_data(DynamicData* pData); + FASTDDS_EXPORTED_API ReturnCode_t delete_data( + DynamicData* pData); - RTPS_DllAPI bool is_empty() const; + FASTDDS_EXPORTED_API bool is_empty() const; }; diff --git a/include/fastrtps/types/DynamicDataHelper.hpp b/include/fastrtps/types/DynamicDataHelper.hpp index 9f1b17d28c0..3607cb773e7 100644 --- a/include/fastrtps/types/DynamicDataHelper.hpp +++ b/include/fastrtps/types/DynamicDataHelper.hpp @@ -30,17 +30,17 @@ class DynamicDataHelper { public: - RTPS_DllAPI static void print( + FASTDDS_EXPORTED_API static void print( const DynamicData_ptr& data); - RTPS_DllAPI static std::ostream& print( + FASTDDS_EXPORTED_API static std::ostream& print( std::ostream& output, const DynamicData_ptr& data); - RTPS_DllAPI static void print( + FASTDDS_EXPORTED_API static void print( const DynamicData* data); - RTPS_DllAPI static std::ostream& print( + FASTDDS_EXPORTED_API static std::ostream& print( std::ostream& output, const DynamicData* data); diff --git a/include/fastrtps/types/DynamicDataPtr.h b/include/fastrtps/types/DynamicDataPtr.h index 342cd274f6d..63075aa33ba 100644 --- a/include/fastrtps/types/DynamicDataPtr.h +++ b/include/fastrtps/types/DynamicDataPtr.h @@ -29,30 +29,30 @@ class DynamicData_ptr : public std::shared_ptr typedef std::shared_ptr Base; - using Base::operator->; - using Base::operator*; + using Base::operator ->; + using Base::operator *; using Base::operator bool; - RTPS_DllAPI DynamicData_ptr() + FASTDDS_EXPORTED_API DynamicData_ptr() { } - RTPS_DllAPI explicit DynamicData_ptr( + FASTDDS_EXPORTED_API explicit DynamicData_ptr( DynamicData* pData); - RTPS_DllAPI DynamicData_ptr( + FASTDDS_EXPORTED_API DynamicData_ptr( const DynamicData_ptr& other) = default; - RTPS_DllAPI DynamicData_ptr( + FASTDDS_EXPORTED_API DynamicData_ptr( DynamicData_ptr&& other) = default; - RTPS_DllAPI DynamicData_ptr& operator =( + FASTDDS_EXPORTED_API DynamicData_ptr& operator =( const DynamicData_ptr&) = default; - RTPS_DllAPI DynamicData_ptr& operator =( + FASTDDS_EXPORTED_API DynamicData_ptr& operator =( DynamicData_ptr&&) = default; - RTPS_DllAPI DynamicData_ptr& operator =( + FASTDDS_EXPORTED_API DynamicData_ptr& operator =( DynamicData*); }; diff --git a/include/fastrtps/types/DynamicPubSubType.h b/include/fastrtps/types/DynamicPubSubType.h index e7ac0a8a80c..f8217949bf1 100644 --- a/include/fastrtps/types/DynamicPubSubType.h +++ b/include/fastrtps/types/DynamicPubSubType.h @@ -45,57 +45,57 @@ class DynamicPubSubType : public eprosima::fastdds::dds::TopicDataType public: - RTPS_DllAPI DynamicPubSubType(); + FASTDDS_EXPORTED_API DynamicPubSubType(); - RTPS_DllAPI DynamicPubSubType( + FASTDDS_EXPORTED_API DynamicPubSubType( DynamicType_ptr pDynamicType); - RTPS_DllAPI virtual ~DynamicPubSubType(); + FASTDDS_EXPORTED_API virtual ~DynamicPubSubType(); - RTPS_DllAPI void* createData() override; + FASTDDS_EXPORTED_API void* createData() override; - RTPS_DllAPI void deleteData ( + FASTDDS_EXPORTED_API void deleteData ( void* data) override; - RTPS_DllAPI bool deserialize ( + FASTDDS_EXPORTED_API bool deserialize ( eprosima::fastrtps::rtps::SerializedPayload_t* payload, void* data) override; - RTPS_DllAPI bool getKey( + FASTDDS_EXPORTED_API bool getKey( void* data, eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - RTPS_DllAPI std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API std::function getSerializedSizeProvider( void* data) override { return getSerializedSizeProvider(data, fastdds::dds::DEFAULT_DATA_REPRESENTATION); } - RTPS_DllAPI std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API std::function getSerializedSizeProvider( void* data, fastdds::dds::DataRepresentationId_t data_representation) override; - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, eprosima::fastrtps::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); } - RTPS_DllAPI bool serialize( + FASTDDS_EXPORTED_API bool serialize( void* data, eprosima::fastrtps::rtps::SerializedPayload_t* payload, fastdds::dds::DataRepresentationId_t data_representation) override; - RTPS_DllAPI void CleanDynamicType(); + FASTDDS_EXPORTED_API void CleanDynamicType(); - RTPS_DllAPI DynamicType_ptr GetDynamicType() const; + FASTDDS_EXPORTED_API DynamicType_ptr GetDynamicType() const; - RTPS_DllAPI ReturnCode_t SetDynamicType( + FASTDDS_EXPORTED_API ReturnCode_t SetDynamicType( DynamicData_ptr pData); - RTPS_DllAPI ReturnCode_t SetDynamicType( + FASTDDS_EXPORTED_API ReturnCode_t SetDynamicType( DynamicType_ptr pType); }; diff --git a/include/fastrtps/types/DynamicType.h b/include/fastrtps/types/DynamicType.h index ab2e81fa938..f14ecf26b74 100644 --- a/include/fastrtps/types/DynamicType.h +++ b/include/fastrtps/types/DynamicType.h @@ -52,15 +52,15 @@ class DynamicType DynamicType(); - RTPS_DllAPI DynamicType( + FASTDDS_EXPORTED_API DynamicType( const TypeDescriptor* descriptor); DynamicType( const DynamicTypeBuilder* other); - RTPS_DllAPI virtual ~DynamicType(); + FASTDDS_EXPORTED_API virtual ~DynamicType(); - RTPS_DllAPI virtual void clear(); + FASTDDS_EXPORTED_API virtual void clear(); ReturnCode_t copy_from_builder( const DynamicTypeBuilder* other); @@ -122,54 +122,54 @@ class DynamicType public: - RTPS_DllAPI bool equals( + FASTDDS_EXPORTED_API bool equals( const DynamicType* other) const; - RTPS_DllAPI ReturnCode_t get_all_members( + FASTDDS_EXPORTED_API ReturnCode_t get_all_members( std::map& members); - RTPS_DllAPI ReturnCode_t get_all_members_by_name( + FASTDDS_EXPORTED_API ReturnCode_t get_all_members_by_name( std::map& members); - RTPS_DllAPI uint32_t get_bounds( + FASTDDS_EXPORTED_API uint32_t get_bounds( uint32_t index = 0) const; - RTPS_DllAPI uint32_t get_bounds_size() const; + FASTDDS_EXPORTED_API uint32_t get_bounds_size() const; - RTPS_DllAPI ReturnCode_t get_descriptor( + FASTDDS_EXPORTED_API ReturnCode_t get_descriptor( TypeDescriptor* descriptor) const; - RTPS_DllAPI const TypeDescriptor* get_descriptor() const; + FASTDDS_EXPORTED_API const TypeDescriptor* get_descriptor() const; - RTPS_DllAPI TypeDescriptor* get_descriptor(); + FASTDDS_EXPORTED_API TypeDescriptor* get_descriptor(); - RTPS_DllAPI bool key_annotation() const; + FASTDDS_EXPORTED_API bool key_annotation() const; - RTPS_DllAPI inline TypeKind get_kind() const + FASTDDS_EXPORTED_API inline TypeKind get_kind() const { return kind_; } - RTPS_DllAPI std::string get_name() const; + FASTDDS_EXPORTED_API std::string get_name() const; - RTPS_DllAPI MemberId get_members_count() const; + FASTDDS_EXPORTED_API MemberId get_members_count() const; - RTPS_DllAPI uint32_t get_total_bounds() const; + FASTDDS_EXPORTED_API uint32_t get_total_bounds() const; - RTPS_DllAPI const TypeDescriptor* get_type_descriptor() const + FASTDDS_EXPORTED_API const TypeDescriptor* get_type_descriptor() const { return descriptor_; } - RTPS_DllAPI bool has_children() const; + FASTDDS_EXPORTED_API bool has_children() const; - RTPS_DllAPI bool is_consistent() const; + FASTDDS_EXPORTED_API bool is_consistent() const; - RTPS_DllAPI bool is_complex_kind() const; + FASTDDS_EXPORTED_API bool is_complex_kind() const; - RTPS_DllAPI bool is_discriminator_type() const; + FASTDDS_EXPORTED_API bool is_discriminator_type() const; - RTPS_DllAPI size_t get_size() const; + FASTDDS_EXPORTED_API size_t get_size() const; }; diff --git a/include/fastrtps/types/DynamicTypeBuilder.h b/include/fastrtps/types/DynamicTypeBuilder.h index 1d26ea66e19..4dca61cb0e7 100644 --- a/include/fastrtps/types/DynamicTypeBuilder.h +++ b/include/fastrtps/types/DynamicTypeBuilder.h @@ -31,11 +31,14 @@ class DynamicTypeMember; class DynamicTypeBuilder { protected: + DynamicTypeBuilder(); - DynamicTypeBuilder(const DynamicTypeBuilder* builder); + DynamicTypeBuilder( + const DynamicTypeBuilder* builder); - DynamicTypeBuilder(const TypeDescriptor* descriptor); + DynamicTypeBuilder( + const TypeDescriptor* descriptor); virtual ~DynamicTypeBuilder(); @@ -60,36 +63,41 @@ class DynamicTypeBuilder const std::string& key, const std::string& value); - bool check_union_configuration(const MemberDescriptor* descriptor); + bool check_union_configuration( + const MemberDescriptor* descriptor); // Checks if there is a member with the given name. - bool exists_member_by_name(const std::string& name) const; + bool exists_member_by_name( + const std::string& name) const; void refresh_member_ids(); void clear(); - ReturnCode_t copy_from_builder(const DynamicTypeBuilder* other); + ReturnCode_t copy_from_builder( + const DynamicTypeBuilder* other); public: - RTPS_DllAPI ReturnCode_t add_empty_member( + + FASTDDS_EXPORTED_API ReturnCode_t add_empty_member( uint32_t index, const std::string& name); - RTPS_DllAPI ReturnCode_t add_member(const MemberDescriptor* descriptor); + FASTDDS_EXPORTED_API ReturnCode_t add_member( + const MemberDescriptor* descriptor); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, DynamicTypeBuilder* type_ = nullptr); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, DynamicTypeBuilder* type_, const std::string& defaultValue); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, DynamicTypeBuilder* type_, @@ -97,18 +105,18 @@ class DynamicTypeBuilder const std::vector& unionLabels, bool isDefaultLabel); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, - DynamicType_ptr type_ = DynamicType_ptr(nullptr)); + DynamicType_ptr type_ = DynamicType_ptr(nullptr)); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, DynamicType_ptr type_, const std::string& defaultValue); - RTPS_DllAPI ReturnCode_t add_member( + FASTDDS_EXPORTED_API ReturnCode_t add_member( MemberId id, const std::string& name, DynamicType_ptr type_, @@ -116,37 +124,41 @@ class DynamicTypeBuilder const std::vector& unionLabels, bool isDefaultLabel); - RTPS_DllAPI ReturnCode_t apply_annotation(AnnotationDescriptor& descriptor); + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( + AnnotationDescriptor& descriptor); - RTPS_DllAPI ReturnCode_t apply_annotation( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( const std::string& annotation_name, const std::string& key, const std::string& value); - RTPS_DllAPI ReturnCode_t apply_annotation_to_member( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation_to_member( MemberId id, AnnotationDescriptor& descriptor); - RTPS_DllAPI ReturnCode_t apply_annotation_to_member( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation_to_member( MemberId id, const std::string& annotation_name, const std::string& key, const std::string& value); - RTPS_DllAPI DynamicType_ptr build(); + FASTDDS_EXPORTED_API DynamicType_ptr build(); - RTPS_DllAPI ReturnCode_t copy_from(const DynamicTypeBuilder* other); + FASTDDS_EXPORTED_API ReturnCode_t copy_from( + const DynamicTypeBuilder* other); - ReturnCode_t get_all_members(std::map& members); + ReturnCode_t get_all_members( + std::map& members); - RTPS_DllAPI inline TypeKind get_kind() const + FASTDDS_EXPORTED_API inline TypeKind get_kind() const { return kind_; } - RTPS_DllAPI std::string get_name() const; + FASTDDS_EXPORTED_API std::string get_name() const; - RTPS_DllAPI MemberId get_member_id_by_name(const std::string& name) const; + FASTDDS_EXPORTED_API MemberId get_member_id_by_name( + const std::string& name) const; const TypeDescriptor* get_type_descriptor() const { @@ -157,7 +169,8 @@ class DynamicTypeBuilder bool is_discriminator_type() const; - RTPS_DllAPI ReturnCode_t set_name(const std::string& name); + FASTDDS_EXPORTED_API ReturnCode_t set_name( + const std::string& name); }; } // namespace types diff --git a/include/fastrtps/types/DynamicTypeBuilderFactory.h b/include/fastrtps/types/DynamicTypeBuilderFactory.h index 3fa52ea39b8..dd9ff13d813 100644 --- a/include/fastrtps/types/DynamicTypeBuilderFactory.h +++ b/include/fastrtps/types/DynamicTypeBuilderFactory.h @@ -125,189 +125,189 @@ class DynamicTypeBuilderFactory public: - RTPS_DllAPI static DynamicTypeBuilderFactory* get_instance(); + FASTDDS_EXPORTED_API static DynamicTypeBuilderFactory* get_instance(); - RTPS_DllAPI static ReturnCode_t delete_instance(); + FASTDDS_EXPORTED_API static ReturnCode_t delete_instance(); ~DynamicTypeBuilderFactory(); - RTPS_DllAPI DynamicType_ptr get_primitive_type( + FASTDDS_EXPORTED_API DynamicType_ptr get_primitive_type( TypeKind kind); - RTPS_DllAPI ReturnCode_t delete_builder( + FASTDDS_EXPORTED_API ReturnCode_t delete_builder( DynamicTypeBuilder* builder); - RTPS_DllAPI ReturnCode_t delete_type( + FASTDDS_EXPORTED_API ReturnCode_t delete_type( DynamicType* type); - RTPS_DllAPI DynamicTypeBuilder* create_custom_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_custom_builder( const TypeDescriptor* descriptor, const std::string& name = ""); - RTPS_DllAPI DynamicTypeBuilder* create_builder_copy( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_builder_copy( const DynamicTypeBuilder* type); - RTPS_DllAPI DynamicTypeBuilder* create_int32_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_int32_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_uint32_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_uint32_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_int16_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_int16_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_uint16_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_uint16_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_int64_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_int64_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_uint64_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_uint64_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_float32_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_float32_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_float64_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_float64_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_float128_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_float128_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_char8_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_char8_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_char16_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_char16_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_bool_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_bool_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_byte_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_byte_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_string_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_string_builder( uint32_t bound = MAX_STRING_LENGTH); - RTPS_DllAPI DynamicTypeBuilder* create_wstring_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_wstring_builder( uint32_t bound = MAX_STRING_LENGTH); - RTPS_DllAPI DynamicTypeBuilder* create_sequence_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_sequence_builder( const DynamicTypeBuilder* element_type, uint32_t bound = MAX_ELEMENTS_COUNT); - RTPS_DllAPI DynamicTypeBuilder* create_sequence_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_sequence_builder( const DynamicType_ptr type, uint32_t bound = MAX_ELEMENTS_COUNT); - RTPS_DllAPI DynamicTypeBuilder* create_array_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_array_builder( const DynamicTypeBuilder* element_type, const std::vector& bounds); - RTPS_DllAPI DynamicTypeBuilder* create_array_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_array_builder( const DynamicType_ptr type, const std::vector& bounds); - RTPS_DllAPI DynamicTypeBuilder* create_map_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_map_builder( DynamicTypeBuilder* key_element_type, DynamicTypeBuilder* element_type, uint32_t bound = MAX_ELEMENTS_COUNT); - RTPS_DllAPI DynamicTypeBuilder* create_map_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_map_builder( DynamicType_ptr key_type, DynamicType_ptr value_type, uint32_t bound = MAX_ELEMENTS_COUNT); - RTPS_DllAPI DynamicTypeBuilder* create_bitmask_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_bitmask_builder( uint32_t bound); - RTPS_DllAPI DynamicTypeBuilder* create_bitset_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_bitset_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_alias_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_alias_builder( DynamicTypeBuilder* base_type, const std::string& sName); - RTPS_DllAPI DynamicTypeBuilder* create_alias_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_alias_builder( DynamicType_ptr base_type, const std::string& sName); - RTPS_DllAPI DynamicTypeBuilder* create_enum_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_enum_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_struct_builder(); + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_struct_builder(); - RTPS_DllAPI DynamicTypeBuilder* create_child_struct_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_child_struct_builder( DynamicTypeBuilder* parent_type); - RTPS_DllAPI DynamicTypeBuilder* create_union_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_union_builder( DynamicTypeBuilder* discriminator_type); - RTPS_DllAPI DynamicTypeBuilder* create_union_builder( + FASTDDS_EXPORTED_API DynamicTypeBuilder* create_union_builder( DynamicType_ptr discriminator_type); - RTPS_DllAPI DynamicType_ptr create_annotation_primitive( + FASTDDS_EXPORTED_API DynamicType_ptr create_annotation_primitive( const std::string& name); - RTPS_DllAPI DynamicType_ptr create_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_type( const TypeDescriptor* descriptor, const std::string& name = ""); - RTPS_DllAPI DynamicType_ptr create_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_type( const DynamicTypeBuilder* other); - RTPS_DllAPI DynamicType_ptr create_alias_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_alias_type( DynamicTypeBuilder* base_type, const std::string& sName); - RTPS_DllAPI DynamicType_ptr create_alias_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_alias_type( DynamicType_ptr base_type, const std::string& sName); - RTPS_DllAPI DynamicType_ptr create_int32_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_int32_type(); - RTPS_DllAPI DynamicType_ptr create_uint32_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_uint32_type(); - RTPS_DllAPI DynamicType_ptr create_int16_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_int16_type(); - RTPS_DllAPI DynamicType_ptr create_uint16_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_uint16_type(); - RTPS_DllAPI DynamicType_ptr create_int64_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_int64_type(); - RTPS_DllAPI DynamicType_ptr create_uint64_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_uint64_type(); - RTPS_DllAPI DynamicType_ptr create_float32_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_float32_type(); - RTPS_DllAPI DynamicType_ptr create_float64_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_float64_type(); - RTPS_DllAPI DynamicType_ptr create_float128_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_float128_type(); - RTPS_DllAPI DynamicType_ptr create_char8_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_char8_type(); - RTPS_DllAPI DynamicType_ptr create_char16_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_char16_type(); - RTPS_DllAPI DynamicType_ptr create_bool_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_bool_type(); - RTPS_DllAPI DynamicType_ptr create_byte_type(); + FASTDDS_EXPORTED_API DynamicType_ptr create_byte_type(); - RTPS_DllAPI DynamicType_ptr create_string_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_string_type( uint32_t bound = MAX_STRING_LENGTH); - RTPS_DllAPI DynamicType_ptr create_wstring_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_wstring_type( uint32_t bound = MAX_STRING_LENGTH); - RTPS_DllAPI DynamicType_ptr create_bitset_type( + FASTDDS_EXPORTED_API DynamicType_ptr create_bitset_type( uint32_t bound); - RTPS_DllAPI void build_type_identifier( + FASTDDS_EXPORTED_API void build_type_identifier( const DynamicType_ptr type, TypeIdentifier& identifier, bool complete = true) const; - RTPS_DllAPI void build_type_identifier( + FASTDDS_EXPORTED_API void build_type_identifier( const TypeDescriptor* descriptor, TypeIdentifier& identifier, bool complete = true) const; - RTPS_DllAPI void build_type_object( + FASTDDS_EXPORTED_API void build_type_object( const DynamicType_ptr type, TypeObject& object, bool complete = true, bool force = false) const; - RTPS_DllAPI void build_type_object( + FASTDDS_EXPORTED_API void build_type_object( const TypeDescriptor* descriptor, TypeObject& object, const std::vector* members = nullptr, bool complete = true, bool force = false) const; - RTPS_DllAPI bool is_empty() const; + FASTDDS_EXPORTED_API bool is_empty() const; }; } // namespace types diff --git a/include/fastrtps/types/DynamicTypeBuilderPtr.h b/include/fastrtps/types/DynamicTypeBuilderPtr.h index f3bb41e3fdb..b208286b30e 100644 --- a/include/fastrtps/types/DynamicTypeBuilderPtr.h +++ b/include/fastrtps/types/DynamicTypeBuilderPtr.h @@ -33,26 +33,26 @@ class DynamicTypeBuilder_ptr : public std::shared_ptr using Base::operator *; using Base::operator bool; - RTPS_DllAPI DynamicTypeBuilder_ptr() + FASTDDS_EXPORTED_API DynamicTypeBuilder_ptr() { } - RTPS_DllAPI DynamicTypeBuilder_ptr( + FASTDDS_EXPORTED_API DynamicTypeBuilder_ptr( DynamicTypeBuilder* pType); - RTPS_DllAPI DynamicTypeBuilder_ptr( + FASTDDS_EXPORTED_API DynamicTypeBuilder_ptr( DynamicTypeBuilder_ptr&& other) = default; - RTPS_DllAPI DynamicTypeBuilder_ptr& operator =( + FASTDDS_EXPORTED_API DynamicTypeBuilder_ptr& operator =( DynamicTypeBuilder_ptr&&) = default; - RTPS_DllAPI bool operator !=( + FASTDDS_EXPORTED_API bool operator !=( std::nullptr_t) const { return bool(*this); } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( std::nullptr_t) const { return !*this; diff --git a/include/fastrtps/types/DynamicTypeMember.h b/include/fastrtps/types/DynamicTypeMember.h index 5cef28d9c32..3b3f5f3654b 100644 --- a/include/fastrtps/types/DynamicTypeMember.h +++ b/include/fastrtps/types/DynamicTypeMember.h @@ -47,48 +47,48 @@ class DynamicTypeMember public: - RTPS_DllAPI DynamicTypeMember(); + FASTDDS_EXPORTED_API DynamicTypeMember(); - RTPS_DllAPI DynamicTypeMember( + FASTDDS_EXPORTED_API DynamicTypeMember( const DynamicTypeMember* other); - RTPS_DllAPI DynamicTypeMember( + FASTDDS_EXPORTED_API DynamicTypeMember( const MemberDescriptor* descriptor, MemberId id); ~DynamicTypeMember(); - RTPS_DllAPI ReturnCode_t apply_annotation( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( AnnotationDescriptor& descriptor); - RTPS_DllAPI ReturnCode_t apply_annotation( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( const std::string& annotation_name, const std::string& key, const std::string& value); - RTPS_DllAPI bool equals( + FASTDDS_EXPORTED_API bool equals( const DynamicTypeMember*) const; - RTPS_DllAPI ReturnCode_t get_annotation( + FASTDDS_EXPORTED_API ReturnCode_t get_annotation( AnnotationDescriptor& descriptor, uint32_t idx); - RTPS_DllAPI uint32_t get_annotation_count(); + FASTDDS_EXPORTED_API uint32_t get_annotation_count(); - RTPS_DllAPI bool key_annotation() const; + FASTDDS_EXPORTED_API bool key_annotation() const; - RTPS_DllAPI std::vector get_union_labels() const; + FASTDDS_EXPORTED_API std::vector get_union_labels() const; - RTPS_DllAPI ReturnCode_t get_descriptor( + FASTDDS_EXPORTED_API ReturnCode_t get_descriptor( MemberDescriptor* descriptor) const; - RTPS_DllAPI MemberId get_id() const; + FASTDDS_EXPORTED_API MemberId get_id() const; - RTPS_DllAPI std::string get_name() const; + FASTDDS_EXPORTED_API std::string get_name() const; - RTPS_DllAPI bool is_default_union_value() const; + FASTDDS_EXPORTED_API bool is_default_union_value() const; - RTPS_DllAPI const MemberDescriptor* get_descriptor() const + FASTDDS_EXPORTED_API const MemberDescriptor* get_descriptor() const { return &descriptor_; } diff --git a/include/fastrtps/types/DynamicTypePtr.h b/include/fastrtps/types/DynamicTypePtr.h index b37119ccff8..f53c811e519 100644 --- a/include/fastrtps/types/DynamicTypePtr.h +++ b/include/fastrtps/types/DynamicTypePtr.h @@ -37,31 +37,31 @@ class DynamicType_ptr : public std::shared_ptr { } - RTPS_DllAPI explicit DynamicType_ptr( + FASTDDS_EXPORTED_API explicit DynamicType_ptr( DynamicType* pType); - RTPS_DllAPI DynamicType_ptr( + FASTDDS_EXPORTED_API DynamicType_ptr( const DynamicType_ptr& other) = default; - RTPS_DllAPI DynamicType_ptr( + FASTDDS_EXPORTED_API DynamicType_ptr( DynamicType_ptr&& other) = default; - RTPS_DllAPI DynamicType_ptr& operator =( + FASTDDS_EXPORTED_API DynamicType_ptr& operator =( const DynamicType_ptr&) = default; - RTPS_DllAPI DynamicType_ptr& operator =( + FASTDDS_EXPORTED_API DynamicType_ptr& operator =( DynamicType_ptr&&) = default; - RTPS_DllAPI DynamicType_ptr& operator =( + FASTDDS_EXPORTED_API DynamicType_ptr& operator =( DynamicType*); - RTPS_DllAPI bool operator !=( + FASTDDS_EXPORTED_API bool operator !=( std::nullptr_t) const { return bool(*this); } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( std::nullptr_t) const { return !*this; diff --git a/include/fastrtps/types/MemberDescriptor.h b/include/fastrtps/types/MemberDescriptor.h index f7cdfcb4a1f..f6f1fc69706 100644 --- a/include/fastrtps/types/MemberDescriptor.h +++ b/include/fastrtps/types/MemberDescriptor.h @@ -18,9 +18,9 @@ #include #include -namespace eprosima{ -namespace fastrtps{ -namespace types{ +namespace eprosima { +namespace fastrtps { +namespace types { class DynamicType; class AnnotationDescriptor; @@ -28,6 +28,7 @@ class AnnotationDescriptor; class MemberDescriptor { protected: + std::string name_; // Name of the member MemberId id_; // MemberId, it should be filled automatically when the member is added. DynamicType_ptr type_; // Member's Type. @@ -43,29 +44,32 @@ class MemberDescriptor friend class DynamicTypeMember; friend class TypeObjectFactory; - bool is_default_value_consistent(const std::string& sDefaultValue) const; + bool is_default_value_consistent( + const std::string& sDefaultValue) const; - bool is_type_name_consistent(const std::string& sName) const; + bool is_type_name_consistent( + const std::string& sName) const; public: - RTPS_DllAPI MemberDescriptor(); - RTPS_DllAPI MemberDescriptor( + FASTDDS_EXPORTED_API MemberDescriptor(); + + FASTDDS_EXPORTED_API MemberDescriptor( uint32_t index, const std::string& name); - RTPS_DllAPI MemberDescriptor( + FASTDDS_EXPORTED_API MemberDescriptor( MemberId id, const std::string& name, DynamicType_ptr type_); - RTPS_DllAPI MemberDescriptor( + FASTDDS_EXPORTED_API MemberDescriptor( MemberId id, const std::string& name, DynamicType_ptr type_, const std::string& defaultValue); - RTPS_DllAPI MemberDescriptor( + FASTDDS_EXPORTED_API MemberDescriptor( MemberId id, const std::string& name, DynamicType_ptr type_, @@ -73,27 +77,31 @@ class MemberDescriptor const std::vector& unionLabels, bool isDefaultLabel); - RTPS_DllAPI MemberDescriptor(const MemberDescriptor* descriptor); + FASTDDS_EXPORTED_API MemberDescriptor( + const MemberDescriptor* descriptor); - RTPS_DllAPI ~MemberDescriptor(); + FASTDDS_EXPORTED_API ~MemberDescriptor(); - bool check_union_labels(const std::vector& labels) const; + bool check_union_labels( + const std::vector& labels) const; - RTPS_DllAPI ReturnCode_t copy_from(const MemberDescriptor* other); + FASTDDS_EXPORTED_API ReturnCode_t copy_from( + const MemberDescriptor* other); - RTPS_DllAPI bool equals(const MemberDescriptor* other) const; + FASTDDS_EXPORTED_API bool equals( + const MemberDescriptor* other) const; - RTPS_DllAPI TypeKind get_kind() const; + FASTDDS_EXPORTED_API TypeKind get_kind() const; - RTPS_DllAPI MemberId get_id() const; + FASTDDS_EXPORTED_API MemberId get_id() const; - RTPS_DllAPI uint32_t get_index() const; + FASTDDS_EXPORTED_API uint32_t get_index() const; - RTPS_DllAPI std::string get_name() const; + FASTDDS_EXPORTED_API std::string get_name() const; - RTPS_DllAPI std::vector get_union_labels() const; + FASTDDS_EXPORTED_API std::vector get_union_labels() const; - RTPS_DllAPI std::string get_default_value() const + FASTDDS_EXPORTED_API std::string get_default_value() const { if (!default_value_.empty()) { @@ -103,88 +111,106 @@ class MemberDescriptor return annotation_get_default(); } - RTPS_DllAPI bool is_default_union_value() const; + FASTDDS_EXPORTED_API bool is_default_union_value() const; - RTPS_DllAPI bool is_consistent(TypeKind parentKind) const; + FASTDDS_EXPORTED_API bool is_consistent( + TypeKind parentKind) const; - RTPS_DllAPI void add_union_case_index(uint64_t value); + FASTDDS_EXPORTED_API void add_union_case_index( + uint64_t value); - RTPS_DllAPI void set_id(MemberId id); + FASTDDS_EXPORTED_API void set_id( + MemberId id); - RTPS_DllAPI void set_index(uint32_t index); + FASTDDS_EXPORTED_API void set_index( + uint32_t index); - RTPS_DllAPI void set_name(const std::string& name); + FASTDDS_EXPORTED_API void set_name( + const std::string& name); - RTPS_DllAPI void set_type(DynamicType_ptr type); + FASTDDS_EXPORTED_API void set_type( + DynamicType_ptr type); - RTPS_DllAPI DynamicType_ptr get_type() const + FASTDDS_EXPORTED_API DynamicType_ptr get_type() const { return type_; } - RTPS_DllAPI void set_default_union_value(bool bDefault); + FASTDDS_EXPORTED_API void set_default_union_value( + bool bDefault); - RTPS_DllAPI void set_default_value(const std::string& value) + FASTDDS_EXPORTED_API void set_default_value( + const std::string& value) { default_value_ = value; } // Annotations - ReturnCode_t apply_annotation(AnnotationDescriptor& descriptor); + ReturnCode_t apply_annotation( + AnnotationDescriptor& descriptor); ReturnCode_t apply_annotation( const std::string& annotation_name, const std::string& key, const std::string& value); - AnnotationDescriptor* get_annotation(const std::string& name) const; + AnnotationDescriptor* get_annotation( + const std::string& name) const; // Annotations application - RTPS_DllAPI bool annotation_is_optional() const; + FASTDDS_EXPORTED_API bool annotation_is_optional() const; - RTPS_DllAPI bool annotation_is_key() const; + FASTDDS_EXPORTED_API bool annotation_is_key() const; - RTPS_DllAPI bool annotation_is_must_understand() const; + FASTDDS_EXPORTED_API bool annotation_is_must_understand() const; - RTPS_DllAPI bool annotation_is_non_serialized() const; + FASTDDS_EXPORTED_API bool annotation_is_non_serialized() const; - RTPS_DllAPI bool annotation_is_value() const; + FASTDDS_EXPORTED_API bool annotation_is_value() const; - RTPS_DllAPI bool annotation_is_default_literal() const; + FASTDDS_EXPORTED_API bool annotation_is_default_literal() const; - RTPS_DllAPI bool annotation_is_position() const; + FASTDDS_EXPORTED_API bool annotation_is_position() const; - RTPS_DllAPI bool annotation_is_bit_bound() const; + FASTDDS_EXPORTED_API bool annotation_is_bit_bound() const; // Annotations getters - RTPS_DllAPI bool annotation_get_key() const; + FASTDDS_EXPORTED_API bool annotation_get_key() const; - RTPS_DllAPI std::string annotation_get_value() const; + FASTDDS_EXPORTED_API std::string annotation_get_value() const; - RTPS_DllAPI std::string annotation_get_default() const; + FASTDDS_EXPORTED_API std::string annotation_get_default() const; - RTPS_DllAPI uint16_t annotation_get_position() const; + FASTDDS_EXPORTED_API uint16_t annotation_get_position() const; - RTPS_DllAPI uint16_t annotation_get_bit_bound() const; + FASTDDS_EXPORTED_API uint16_t annotation_get_bit_bound() const; // Annotations setters - RTPS_DllAPI void annotation_set_optional(bool optional); + FASTDDS_EXPORTED_API void annotation_set_optional( + bool optional); - RTPS_DllAPI void annotation_set_key(bool key); + FASTDDS_EXPORTED_API void annotation_set_key( + bool key); - RTPS_DllAPI void annotation_set_must_understand(bool must_understand); + FASTDDS_EXPORTED_API void annotation_set_must_understand( + bool must_understand); - RTPS_DllAPI void annotation_set_non_serialized(bool non_serialized); + FASTDDS_EXPORTED_API void annotation_set_non_serialized( + bool non_serialized); - RTPS_DllAPI void annotation_set_value(const std::string& value); + FASTDDS_EXPORTED_API void annotation_set_value( + const std::string& value); - RTPS_DllAPI void annotation_set_default(const std::string& default_value); + FASTDDS_EXPORTED_API void annotation_set_default( + const std::string& default_value); - RTPS_DllAPI void annotation_set_default_literal(); + FASTDDS_EXPORTED_API void annotation_set_default_literal(); - RTPS_DllAPI void annotation_set_position(uint16_t position); + FASTDDS_EXPORTED_API void annotation_set_position( + uint16_t position); - RTPS_DllAPI void annotation_set_bit_bound(uint16_t bit_bound); + FASTDDS_EXPORTED_API void annotation_set_bit_bound( + uint16_t bit_bound); }; } // namespace types diff --git a/include/fastrtps/types/TypeDescriptor.h b/include/fastrtps/types/TypeDescriptor.h index c6f5654d896..996d7344658 100644 --- a/include/fastrtps/types/TypeDescriptor.h +++ b/include/fastrtps/types/TypeDescriptor.h @@ -39,7 +39,7 @@ class TypeDescriptor DynamicType_ptr key_element_type_; // Key Type for maps. std::vector annotation_; // Annotations to apply - RTPS_DllAPI void clean(); + FASTDDS_EXPORTED_API void clean(); static bool is_type_name_consistent( const std::string& sName); @@ -52,107 +52,107 @@ class TypeDescriptor public: - RTPS_DllAPI TypeDescriptor(); + FASTDDS_EXPORTED_API TypeDescriptor(); - RTPS_DllAPI TypeDescriptor( + FASTDDS_EXPORTED_API TypeDescriptor( const TypeDescriptor* other); - RTPS_DllAPI TypeDescriptor( + FASTDDS_EXPORTED_API TypeDescriptor( const std::string& name, TypeKind kind); - RTPS_DllAPI ~TypeDescriptor(); + FASTDDS_EXPORTED_API ~TypeDescriptor(); - RTPS_DllAPI ReturnCode_t copy_from( + FASTDDS_EXPORTED_API ReturnCode_t copy_from( const TypeDescriptor* descriptor); - RTPS_DllAPI bool equals( + FASTDDS_EXPORTED_API bool equals( const TypeDescriptor* descriptor) const; - RTPS_DllAPI bool is_consistent() const; + FASTDDS_EXPORTED_API bool is_consistent() const; - RTPS_DllAPI DynamicType_ptr get_base_type() const; + FASTDDS_EXPORTED_API DynamicType_ptr get_base_type() const; - RTPS_DllAPI uint32_t get_bounds( + FASTDDS_EXPORTED_API uint32_t get_bounds( uint32_t index = 0) const; - RTPS_DllAPI uint32_t get_bounds_size() const; + FASTDDS_EXPORTED_API uint32_t get_bounds_size() const; - RTPS_DllAPI DynamicType_ptr get_discriminator_type() const; + FASTDDS_EXPORTED_API DynamicType_ptr get_discriminator_type() const; - RTPS_DllAPI DynamicType_ptr get_element_type() const; + FASTDDS_EXPORTED_API DynamicType_ptr get_element_type() const; - RTPS_DllAPI DynamicType_ptr get_key_element_type() const; + FASTDDS_EXPORTED_API DynamicType_ptr get_key_element_type() const; - RTPS_DllAPI TypeKind get_kind() const; + FASTDDS_EXPORTED_API TypeKind get_kind() const; - RTPS_DllAPI std::string get_name() const; + FASTDDS_EXPORTED_API std::string get_name() const; - RTPS_DllAPI uint32_t get_total_bounds() const; + FASTDDS_EXPORTED_API uint32_t get_total_bounds() const; - RTPS_DllAPI void set_kind( + FASTDDS_EXPORTED_API void set_kind( TypeKind kind); - RTPS_DllAPI void set_name( + FASTDDS_EXPORTED_API void set_name( std::string name); - RTPS_DllAPI ReturnCode_t apply_annotation( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( AnnotationDescriptor& descriptor); - RTPS_DllAPI ReturnCode_t apply_annotation( + FASTDDS_EXPORTED_API ReturnCode_t apply_annotation( const std::string& annotation_name, const std::string& key, const std::string& value); - RTPS_DllAPI AnnotationDescriptor* get_annotation( + FASTDDS_EXPORTED_API AnnotationDescriptor* get_annotation( const std::string& name) const; // Annotations application - RTPS_DllAPI bool annotation_is_extensibility() const; + FASTDDS_EXPORTED_API bool annotation_is_extensibility() const; - RTPS_DllAPI bool annotation_is_mutable() const; + FASTDDS_EXPORTED_API bool annotation_is_mutable() const; - RTPS_DllAPI bool annotation_is_final() const; + FASTDDS_EXPORTED_API bool annotation_is_final() const; - RTPS_DllAPI bool annotation_is_appendable() const; + FASTDDS_EXPORTED_API bool annotation_is_appendable() const; - RTPS_DllAPI bool annotation_is_nested() const; + FASTDDS_EXPORTED_API bool annotation_is_nested() const; - RTPS_DllAPI bool annotation_is_bit_bound() const; + FASTDDS_EXPORTED_API bool annotation_is_bit_bound() const; - RTPS_DllAPI bool annotation_is_key() const; + FASTDDS_EXPORTED_API bool annotation_is_key() const; - RTPS_DllAPI bool annotation_is_non_serialized() const; + FASTDDS_EXPORTED_API bool annotation_is_non_serialized() const; // Annotation getters - RTPS_DllAPI std::string annotation_get_extensibility() const; + FASTDDS_EXPORTED_API std::string annotation_get_extensibility() const; - RTPS_DllAPI bool annotation_get_nested() const; + FASTDDS_EXPORTED_API bool annotation_get_nested() const; - RTPS_DllAPI uint16_t annotation_get_bit_bound() const; + FASTDDS_EXPORTED_API uint16_t annotation_get_bit_bound() const; - RTPS_DllAPI bool annotation_get_key() const; + FASTDDS_EXPORTED_API bool annotation_get_key() const; // Annotation setters - RTPS_DllAPI void annotation_set_extensibility( + FASTDDS_EXPORTED_API void annotation_set_extensibility( const std::string& extensibility); - RTPS_DllAPI void annotation_set_mutable(); + FASTDDS_EXPORTED_API void annotation_set_mutable(); - RTPS_DllAPI void annotation_set_final(); + FASTDDS_EXPORTED_API void annotation_set_final(); - RTPS_DllAPI void annotation_set_appendable(); + FASTDDS_EXPORTED_API void annotation_set_appendable(); - RTPS_DllAPI void annotation_set_nested( + FASTDDS_EXPORTED_API void annotation_set_nested( bool nested); - RTPS_DllAPI void annotation_set_bit_bound( + FASTDDS_EXPORTED_API void annotation_set_bit_bound( uint16_t bit_bound); - RTPS_DllAPI void annotation_set_key( + FASTDDS_EXPORTED_API void annotation_set_key( bool key); - RTPS_DllAPI void annotation_set_non_serialized( + FASTDDS_EXPORTED_API void annotation_set_non_serialized( bool non_serialized); }; diff --git a/include/fastrtps/types/TypeIdentifier.h b/include/fastrtps/types/TypeIdentifier.h index 63c7d43beae..03e4ca8cc9f 100644 --- a/include/fastrtps/types/TypeIdentifier.h +++ b/include/fastrtps/types/TypeIdentifier.h @@ -84,39 +84,39 @@ class TypeIdentifier /*! * @brief Default constructor. */ - RTPS_DllAPI TypeIdentifier(); + FASTDDS_EXPORTED_API TypeIdentifier(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~TypeIdentifier(); + FASTDDS_EXPORTED_API ~TypeIdentifier(); /*! * @brief Copy constructor. * @param x Reference to the object TypeIdentifier that will be copied. */ - RTPS_DllAPI TypeIdentifier( + FASTDDS_EXPORTED_API TypeIdentifier( const TypeIdentifier& x); /*! * @brief Move constructor. * @param x Reference to the object TypeIdentifier that will be copied. */ - RTPS_DllAPI TypeIdentifier( + FASTDDS_EXPORTED_API TypeIdentifier( TypeIdentifier&& x); /*! * @brief Copy assignment. * @param x Reference to the object TypeIdentifier that will be copied. */ - RTPS_DllAPI TypeIdentifier& operator =( + FASTDDS_EXPORTED_API TypeIdentifier& operator =( const TypeIdentifier& x); /*! * @brief Move assignment. * @param x Reference to the object TypeIdentifier that will be copied. */ - RTPS_DllAPI TypeIdentifier& operator =( + FASTDDS_EXPORTED_API TypeIdentifier& operator =( TypeIdentifier&& x); /*! @@ -124,26 +124,26 @@ class TypeIdentifier * @param __d New value for the discriminator. * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( octet __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - RTPS_DllAPI octet _d() const; + FASTDDS_EXPORTED_API octet _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - RTPS_DllAPI octet& _d(); + FASTDDS_EXPORTED_API octet& _d(); /*! * @brief This function sets a value in member string_sdefn * @param _string_sdefn New value for member string_sdefn */ - RTPS_DllAPI void string_sdefn( + FASTDDS_EXPORTED_API void string_sdefn( StringSTypeDefn _string_sdefn); /*! @@ -151,19 +151,19 @@ class TypeIdentifier * @return Value of member string_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const StringSTypeDefn& string_sdefn() const; + FASTDDS_EXPORTED_API const StringSTypeDefn& string_sdefn() const; /*! * @brief This function returns a reference to member string_sdefn * @return Reference to member string_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI StringSTypeDefn& string_sdefn(); + FASTDDS_EXPORTED_API StringSTypeDefn& string_sdefn(); /*! * @brief This function sets a value in member string_ldefn * @param _string_ldefn New value for member string_ldefn */ - RTPS_DllAPI void string_ldefn( + FASTDDS_EXPORTED_API void string_ldefn( StringLTypeDefn _string_ldefn); /*! @@ -171,19 +171,19 @@ class TypeIdentifier * @return Value of member string_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const StringLTypeDefn& string_ldefn() const; + FASTDDS_EXPORTED_API const StringLTypeDefn& string_ldefn() const; /*! * @brief This function returns a reference to member string_ldefn * @return Reference to member string_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI StringLTypeDefn& string_ldefn(); + FASTDDS_EXPORTED_API StringLTypeDefn& string_ldefn(); /*! * @brief This function sets a value in member seq_sdefn * @param _seq_sdefn New value for member seq_sdefn */ - RTPS_DllAPI void seq_sdefn( + FASTDDS_EXPORTED_API void seq_sdefn( PlainSequenceSElemDefn _seq_sdefn); /*! @@ -191,19 +191,19 @@ class TypeIdentifier * @return Value of member seq_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainSequenceSElemDefn& seq_sdefn() const; + FASTDDS_EXPORTED_API const PlainSequenceSElemDefn& seq_sdefn() const; /*! * @brief This function returns a reference to member seq_sdefn * @return Reference to member seq_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainSequenceSElemDefn& seq_sdefn(); + FASTDDS_EXPORTED_API PlainSequenceSElemDefn& seq_sdefn(); /*! * @brief This function sets a value in member seq_ldefn * @param _seq_ldefn New value for member seq_ldefn */ - RTPS_DllAPI void seq_ldefn( + FASTDDS_EXPORTED_API void seq_ldefn( PlainSequenceLElemDefn _seq_ldefn); /*! @@ -211,19 +211,19 @@ class TypeIdentifier * @return Value of member seq_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainSequenceLElemDefn& seq_ldefn() const; + FASTDDS_EXPORTED_API const PlainSequenceLElemDefn& seq_ldefn() const; /*! * @brief This function returns a reference to member seq_ldefn * @return Reference to member seq_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainSequenceLElemDefn& seq_ldefn(); + FASTDDS_EXPORTED_API PlainSequenceLElemDefn& seq_ldefn(); /*! * @brief This function sets a value in member array_sdefn * @param _array_sdefn New value for member array_sdefn */ - RTPS_DllAPI void array_sdefn( + FASTDDS_EXPORTED_API void array_sdefn( PlainArraySElemDefn _array_sdefn); /*! @@ -231,19 +231,19 @@ class TypeIdentifier * @return Value of member array_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainArraySElemDefn& array_sdefn() const; + FASTDDS_EXPORTED_API const PlainArraySElemDefn& array_sdefn() const; /*! * @brief This function returns a reference to member array_sdefn * @return Reference to member array_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainArraySElemDefn& array_sdefn(); + FASTDDS_EXPORTED_API PlainArraySElemDefn& array_sdefn(); /*! * @brief This function sets a value in member array_ldefn * @param _array_ldefn New value for member array_ldefn */ - RTPS_DllAPI void array_ldefn( + FASTDDS_EXPORTED_API void array_ldefn( PlainArrayLElemDefn _array_ldefn); /*! @@ -251,19 +251,19 @@ class TypeIdentifier * @return Value of member array_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainArrayLElemDefn& array_ldefn() const; + FASTDDS_EXPORTED_API const PlainArrayLElemDefn& array_ldefn() const; /*! * @brief This function returns a reference to member array_ldefn * @return Reference to member array_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainArrayLElemDefn& array_ldefn(); + FASTDDS_EXPORTED_API PlainArrayLElemDefn& array_ldefn(); /*! * @brief This function sets a value in member map_sdefn * @param _map_sdefn New value for member map_sdefn */ - RTPS_DllAPI void map_sdefn( + FASTDDS_EXPORTED_API void map_sdefn( PlainMapSTypeDefn _map_sdefn); /*! @@ -271,19 +271,19 @@ class TypeIdentifier * @return Value of member map_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainMapSTypeDefn& map_sdefn() const; + FASTDDS_EXPORTED_API const PlainMapSTypeDefn& map_sdefn() const; /*! * @brief This function returns a reference to member map_sdefn * @return Reference to member map_sdefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainMapSTypeDefn& map_sdefn(); + FASTDDS_EXPORTED_API PlainMapSTypeDefn& map_sdefn(); /*! * @brief This function sets a value in member map_ldefn * @param _map_ldefn New value for member map_ldefn */ - RTPS_DllAPI void map_ldefn( + FASTDDS_EXPORTED_API void map_ldefn( PlainMapLTypeDefn _map_ldefn); /*! @@ -291,19 +291,19 @@ class TypeIdentifier * @return Value of member map_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const PlainMapLTypeDefn& map_ldefn() const; + FASTDDS_EXPORTED_API const PlainMapLTypeDefn& map_ldefn() const; /*! * @brief This function returns a reference to member map_ldefn * @return Reference to member map_ldefn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI PlainMapLTypeDefn& map_ldefn(); + FASTDDS_EXPORTED_API PlainMapLTypeDefn& map_ldefn(); /*! * @brief This function sets a value in member sc_component_id * @param _sc_component_id New value for member sc_component_id */ - RTPS_DllAPI void sc_component_id( + FASTDDS_EXPORTED_API void sc_component_id( StronglyConnectedComponentId _sc_component_id); /*! @@ -311,19 +311,19 @@ class TypeIdentifier * @return Value of member sc_component_id * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI StronglyConnectedComponentId sc_component_id() const; + FASTDDS_EXPORTED_API StronglyConnectedComponentId sc_component_id() const; /*! * @brief This function returns a reference to member sc_component_id * @return Reference to member sc_component_id * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI StronglyConnectedComponentId& sc_component_id(); + FASTDDS_EXPORTED_API StronglyConnectedComponentId& sc_component_id(); /*! * @brief This function sets a value in member equivalence_hash * @param _equivalence_hash New value for member equivalence_hash */ - RTPS_DllAPI void equivalence_hash( + FASTDDS_EXPORTED_API void equivalence_hash( EquivalenceHash _equivalence_hash); /*! @@ -331,19 +331,19 @@ class TypeIdentifier * @return Value of member equivalence_hash * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const octet* equivalence_hash() const; + FASTDDS_EXPORTED_API const octet* equivalence_hash() const; /*! * @brief This function returns a reference to member equivalence_hash * @return Reference to member equivalence_hash * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI octet* equivalence_hash(); + FASTDDS_EXPORTED_API octet* equivalence_hash(); /*! * @brief This function sets a value in member extended_defn * @param _extended_defn New value for member extended_defn */ - RTPS_DllAPI void extended_defn( + FASTDDS_EXPORTED_API void extended_defn( ExtendedTypeDefn _extended_defn); /*! @@ -351,14 +351,14 @@ class TypeIdentifier * @return Value of member extended_defn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const ExtendedTypeDefn& extended_defn() const; + FASTDDS_EXPORTED_API const ExtendedTypeDefn& extended_defn() const; /*! * @brief This function returns a reference to member extended_defn * @return Reference to member extended_defn * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI ExtendedTypeDefn& extended_defn(); + FASTDDS_EXPORTED_API ExtendedTypeDefn& extended_defn(); /** * Equals @@ -366,7 +366,7 @@ class TypeIdentifier bool operator ==( const TypeIdentifier& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const TypeIdentifier& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -374,7 +374,7 @@ class TypeIdentifier * @brief equivalence_hash_to_string * @return string representation of the equivalence hash */ - RTPS_DllAPI std::string equivalence_hash_to_string() const; + FASTDDS_EXPORTED_API std::string equivalence_hash_to_string() const; private: diff --git a/include/fastrtps/types/TypeIdentifierTypes.h b/include/fastrtps/types/TypeIdentifierTypes.h index 7354472dc6c..376912f7914 100644 --- a/include/fastrtps/types/TypeIdentifierTypes.h +++ b/include/fastrtps/types/TypeIdentifierTypes.h @@ -63,46 +63,46 @@ class StringSTypeDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI StringSTypeDefn(); + FASTDDS_EXPORTED_API StringSTypeDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~StringSTypeDefn(); + FASTDDS_EXPORTED_API ~StringSTypeDefn(); /*! * @brief Copy constructor. * @param x Reference to the object StringSTypeDefn that will be copied. */ - RTPS_DllAPI StringSTypeDefn( + FASTDDS_EXPORTED_API StringSTypeDefn( const StringSTypeDefn& x); /*! * @brief Move constructor. * @param x Reference to the object StringSTypeDefn that will be copied. */ - RTPS_DllAPI StringSTypeDefn( + FASTDDS_EXPORTED_API StringSTypeDefn( StringSTypeDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object StringSTypeDefn that will be copied. */ - RTPS_DllAPI StringSTypeDefn& operator =( + FASTDDS_EXPORTED_API StringSTypeDefn& operator =( const StringSTypeDefn& x); /*! * @brief Move assignment. * @param x Reference to the object StringSTypeDefn that will be copied. */ - RTPS_DllAPI StringSTypeDefn& operator =( + FASTDDS_EXPORTED_API StringSTypeDefn& operator =( StringSTypeDefn&& x); /*! * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( SBound _bound) { m_bound = _bound; @@ -112,7 +112,7 @@ class StringSTypeDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline SBound bound() const + FASTDDS_EXPORTED_API inline SBound bound() const { return m_bound; } @@ -121,16 +121,16 @@ class StringSTypeDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline SBound& bound() + FASTDDS_EXPORTED_API inline SBound& bound() { return m_bound; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const StringSTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const StringLTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -149,46 +149,46 @@ class StringLTypeDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI StringLTypeDefn(); + FASTDDS_EXPORTED_API StringLTypeDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~StringLTypeDefn(); + FASTDDS_EXPORTED_API ~StringLTypeDefn(); /*! * @brief Copy constructor. * @param x Reference to the object StringLTypeDefn that will be copied. */ - RTPS_DllAPI StringLTypeDefn( + FASTDDS_EXPORTED_API StringLTypeDefn( const StringLTypeDefn& x); /*! * @brief Move constructor. * @param x Reference to the object StringLTypeDefn that will be copied. */ - RTPS_DllAPI StringLTypeDefn( + FASTDDS_EXPORTED_API StringLTypeDefn( StringLTypeDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object StringLTypeDefn that will be copied. */ - RTPS_DllAPI StringLTypeDefn& operator =( + FASTDDS_EXPORTED_API StringLTypeDefn& operator =( const StringLTypeDefn& x); /*! * @brief Move assignment. * @param x Reference to the object StringLTypeDefn that will be copied. */ - RTPS_DllAPI StringLTypeDefn& operator =( + FASTDDS_EXPORTED_API StringLTypeDefn& operator =( StringLTypeDefn&& x); /*! * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( LBound _bound) { m_bound = _bound; @@ -198,7 +198,7 @@ class StringLTypeDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline LBound bound() const + FASTDDS_EXPORTED_API inline LBound bound() const { return m_bound; } @@ -207,16 +207,16 @@ class StringLTypeDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline LBound& bound() + FASTDDS_EXPORTED_API inline LBound& bound() { return m_bound; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const StringLTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const StringSTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -235,46 +235,46 @@ class PlainCollectionHeader final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainCollectionHeader(); + FASTDDS_EXPORTED_API PlainCollectionHeader(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainCollectionHeader(); + FASTDDS_EXPORTED_API ~PlainCollectionHeader(); /*! * @brief Copy constructor. * @param x Reference to the object PlainCollectionHeader that will be copied. */ - RTPS_DllAPI PlainCollectionHeader( + FASTDDS_EXPORTED_API PlainCollectionHeader( const PlainCollectionHeader& x); /*! * @brief Move constructor. * @param x Reference to the object PlainCollectionHeader that will be copied. */ - RTPS_DllAPI PlainCollectionHeader( + FASTDDS_EXPORTED_API PlainCollectionHeader( PlainCollectionHeader&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainCollectionHeader that will be copied. */ - RTPS_DllAPI PlainCollectionHeader& operator =( + FASTDDS_EXPORTED_API PlainCollectionHeader& operator =( const PlainCollectionHeader& x); /*! * @brief Move assignment. * @param x Reference to the object PlainCollectionHeader that will be copied. */ - RTPS_DllAPI PlainCollectionHeader& operator =( + FASTDDS_EXPORTED_API PlainCollectionHeader& operator =( PlainCollectionHeader&& x); /*! * @brief This function sets a value in member equiv_kind * @param _equiv_kind New value for member equiv_kind */ - RTPS_DllAPI inline void equiv_kind( + FASTDDS_EXPORTED_API inline void equiv_kind( EquivalenceKind _equiv_kind) { m_equiv_kind = _equiv_kind; @@ -284,7 +284,7 @@ class PlainCollectionHeader final * @brief This function returns the value of member equiv_kind * @return Value of member equiv_kind */ - RTPS_DllAPI inline EquivalenceKind equiv_kind() const + FASTDDS_EXPORTED_API inline EquivalenceKind equiv_kind() const { return m_equiv_kind; } @@ -293,7 +293,7 @@ class PlainCollectionHeader final * @brief This function returns a reference to member equiv_kind * @return Reference to member equiv_kind */ - RTPS_DllAPI inline EquivalenceKind& equiv_kind() + FASTDDS_EXPORTED_API inline EquivalenceKind& equiv_kind() { return m_equiv_kind; } @@ -302,7 +302,7 @@ class PlainCollectionHeader final * @brief This function sets a value in member element_flags * @param _element_flags New value for member element_flags */ - RTPS_DllAPI inline void element_flags( + FASTDDS_EXPORTED_API inline void element_flags( CollectionElementFlag _element_flags) { m_element_flags = _element_flags; @@ -312,7 +312,7 @@ class PlainCollectionHeader final * @brief This function returns the value of member element_flags * @return Value of member element_flags */ - RTPS_DllAPI inline CollectionElementFlag element_flags() const + FASTDDS_EXPORTED_API inline CollectionElementFlag element_flags() const { return m_element_flags; } @@ -321,12 +321,12 @@ class PlainCollectionHeader final * @brief This function returns a reference to member element_flags * @return Reference to member element_flags */ - RTPS_DllAPI inline CollectionElementFlag& element_flags() + FASTDDS_EXPORTED_API inline CollectionElementFlag& element_flags() { return m_element_flags; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainCollectionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -346,46 +346,46 @@ class PlainSequenceSElemDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainSequenceSElemDefn(); + FASTDDS_EXPORTED_API PlainSequenceSElemDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainSequenceSElemDefn(); + FASTDDS_EXPORTED_API ~PlainSequenceSElemDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainSequenceSElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceSElemDefn( + FASTDDS_EXPORTED_API PlainSequenceSElemDefn( const PlainSequenceSElemDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainSequenceSElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceSElemDefn( + FASTDDS_EXPORTED_API PlainSequenceSElemDefn( PlainSequenceSElemDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainSequenceSElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceSElemDefn& operator =( + FASTDDS_EXPORTED_API PlainSequenceSElemDefn& operator =( const PlainSequenceSElemDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainSequenceSElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceSElemDefn& operator =( + FASTDDS_EXPORTED_API PlainSequenceSElemDefn& operator =( PlainSequenceSElemDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -395,7 +395,7 @@ class PlainSequenceSElemDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -405,7 +405,7 @@ class PlainSequenceSElemDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -414,7 +414,7 @@ class PlainSequenceSElemDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -423,7 +423,7 @@ class PlainSequenceSElemDefn final * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( SBound _bound) { m_bound = _bound; @@ -433,7 +433,7 @@ class PlainSequenceSElemDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline SBound bound() const + FASTDDS_EXPORTED_API inline SBound bound() const { return m_bound; } @@ -442,7 +442,7 @@ class PlainSequenceSElemDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline SBound& bound() + FASTDDS_EXPORTED_API inline SBound& bound() { return m_bound; } @@ -451,14 +451,14 @@ class PlainSequenceSElemDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -467,12 +467,12 @@ class PlainSequenceSElemDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainSequenceSElemDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -493,46 +493,46 @@ class PlainSequenceLElemDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainSequenceLElemDefn(); + FASTDDS_EXPORTED_API PlainSequenceLElemDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainSequenceLElemDefn(); + FASTDDS_EXPORTED_API ~PlainSequenceLElemDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainSequenceLElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceLElemDefn( + FASTDDS_EXPORTED_API PlainSequenceLElemDefn( const PlainSequenceLElemDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainSequenceLElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceLElemDefn( + FASTDDS_EXPORTED_API PlainSequenceLElemDefn( PlainSequenceLElemDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainSequenceLElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceLElemDefn& operator =( + FASTDDS_EXPORTED_API PlainSequenceLElemDefn& operator =( const PlainSequenceLElemDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainSequenceLElemDefn that will be copied. */ - RTPS_DllAPI PlainSequenceLElemDefn& operator =( + FASTDDS_EXPORTED_API PlainSequenceLElemDefn& operator =( PlainSequenceLElemDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -542,7 +542,7 @@ class PlainSequenceLElemDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -552,7 +552,7 @@ class PlainSequenceLElemDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -561,7 +561,7 @@ class PlainSequenceLElemDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -570,7 +570,7 @@ class PlainSequenceLElemDefn final * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( LBound _bound) { m_bound = _bound; @@ -580,7 +580,7 @@ class PlainSequenceLElemDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline LBound bound() const + FASTDDS_EXPORTED_API inline LBound bound() const { return m_bound; } @@ -589,7 +589,7 @@ class PlainSequenceLElemDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline LBound& bound() + FASTDDS_EXPORTED_API inline LBound& bound() { return m_bound; } @@ -598,14 +598,14 @@ class PlainSequenceLElemDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -614,12 +614,12 @@ class PlainSequenceLElemDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainSequenceLElemDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -640,46 +640,46 @@ class PlainArraySElemDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainArraySElemDefn(); + FASTDDS_EXPORTED_API PlainArraySElemDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainArraySElemDefn(); + FASTDDS_EXPORTED_API ~PlainArraySElemDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainArraySElemDefn that will be copied. */ - RTPS_DllAPI PlainArraySElemDefn( + FASTDDS_EXPORTED_API PlainArraySElemDefn( const PlainArraySElemDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainArraySElemDefn that will be copied. */ - RTPS_DllAPI PlainArraySElemDefn( + FASTDDS_EXPORTED_API PlainArraySElemDefn( PlainArraySElemDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainArraySElemDefn that will be copied. */ - RTPS_DllAPI PlainArraySElemDefn& operator =( + FASTDDS_EXPORTED_API PlainArraySElemDefn& operator =( const PlainArraySElemDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainArraySElemDefn that will be copied. */ - RTPS_DllAPI PlainArraySElemDefn& operator =( + FASTDDS_EXPORTED_API PlainArraySElemDefn& operator =( PlainArraySElemDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -689,7 +689,7 @@ class PlainArraySElemDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -699,7 +699,7 @@ class PlainArraySElemDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -708,7 +708,7 @@ class PlainArraySElemDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -717,7 +717,7 @@ class PlainArraySElemDefn final * @brief This function copies the value in member array_bound_seq * @param _array_bound_seq New value to be copied in member array_bound_seq */ - RTPS_DllAPI inline void array_bound_seq( + FASTDDS_EXPORTED_API inline void array_bound_seq( const SBoundSeq& _array_bound_seq) { m_array_bound_seq = _array_bound_seq; @@ -727,7 +727,7 @@ class PlainArraySElemDefn final * @brief This function moves the value in member array_bound_seq * @param _array_bound_seq New value to be moved in member array_bound_seq */ - RTPS_DllAPI inline void array_bound_seq( + FASTDDS_EXPORTED_API inline void array_bound_seq( SBoundSeq&& _array_bound_seq) { m_array_bound_seq = std::move(_array_bound_seq); @@ -737,7 +737,7 @@ class PlainArraySElemDefn final * @brief This function returns a constant reference to member array_bound_seq * @return Constant reference to member array_bound_seq */ - RTPS_DllAPI inline const SBoundSeq& array_bound_seq() const + FASTDDS_EXPORTED_API inline const SBoundSeq& array_bound_seq() const { return m_array_bound_seq; } @@ -746,7 +746,7 @@ class PlainArraySElemDefn final * @brief This function returns a reference to member array_bound_seq * @return Reference to member array_bound_seq */ - RTPS_DllAPI inline SBoundSeq& array_bound_seq() + FASTDDS_EXPORTED_API inline SBoundSeq& array_bound_seq() { return m_array_bound_seq; } @@ -755,14 +755,14 @@ class PlainArraySElemDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -771,12 +771,12 @@ class PlainArraySElemDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainArraySElemDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -797,46 +797,46 @@ class PlainArrayLElemDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainArrayLElemDefn(); + FASTDDS_EXPORTED_API PlainArrayLElemDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainArrayLElemDefn(); + FASTDDS_EXPORTED_API ~PlainArrayLElemDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainArrayLElemDefn that will be copied. */ - RTPS_DllAPI PlainArrayLElemDefn( + FASTDDS_EXPORTED_API PlainArrayLElemDefn( const PlainArrayLElemDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainArrayLElemDefn that will be copied. */ - RTPS_DllAPI PlainArrayLElemDefn( + FASTDDS_EXPORTED_API PlainArrayLElemDefn( PlainArrayLElemDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainArrayLElemDefn that will be copied. */ - RTPS_DllAPI PlainArrayLElemDefn& operator =( + FASTDDS_EXPORTED_API PlainArrayLElemDefn& operator =( const PlainArrayLElemDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainArrayLElemDefn that will be copied. */ - RTPS_DllAPI PlainArrayLElemDefn& operator =( + FASTDDS_EXPORTED_API PlainArrayLElemDefn& operator =( PlainArrayLElemDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -846,7 +846,7 @@ class PlainArrayLElemDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -856,7 +856,7 @@ class PlainArrayLElemDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -865,7 +865,7 @@ class PlainArrayLElemDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -874,7 +874,7 @@ class PlainArrayLElemDefn final * @brief This function copies the value in member array_bound_seq * @param _array_bound_seq New value to be copied in member array_bound_seq */ - RTPS_DllAPI inline void array_bound_seq( + FASTDDS_EXPORTED_API inline void array_bound_seq( const LBoundSeq& _array_bound_seq) { m_array_bound_seq = _array_bound_seq; @@ -884,7 +884,7 @@ class PlainArrayLElemDefn final * @brief This function moves the value in member array_bound_seq * @param _array_bound_seq New value to be moved in member array_bound_seq */ - RTPS_DllAPI inline void array_bound_seq( + FASTDDS_EXPORTED_API inline void array_bound_seq( LBoundSeq&& _array_bound_seq) { m_array_bound_seq = std::move(_array_bound_seq); @@ -894,7 +894,7 @@ class PlainArrayLElemDefn final * @brief This function returns a constant reference to member array_bound_seq * @return Constant reference to member array_bound_seq */ - RTPS_DllAPI inline const LBoundSeq& array_bound_seq() const + FASTDDS_EXPORTED_API inline const LBoundSeq& array_bound_seq() const { return m_array_bound_seq; } @@ -903,7 +903,7 @@ class PlainArrayLElemDefn final * @brief This function returns a reference to member array_bound_seq * @return Reference to member array_bound_seq */ - RTPS_DllAPI inline LBoundSeq& array_bound_seq() + FASTDDS_EXPORTED_API inline LBoundSeq& array_bound_seq() { return m_array_bound_seq; } @@ -912,14 +912,14 @@ class PlainArrayLElemDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -928,12 +928,12 @@ class PlainArrayLElemDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainArrayLElemDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -954,46 +954,46 @@ class PlainMapSTypeDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainMapSTypeDefn(); + FASTDDS_EXPORTED_API PlainMapSTypeDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainMapSTypeDefn(); + FASTDDS_EXPORTED_API ~PlainMapSTypeDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainMapSTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapSTypeDefn( + FASTDDS_EXPORTED_API PlainMapSTypeDefn( const PlainMapSTypeDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainMapSTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapSTypeDefn( + FASTDDS_EXPORTED_API PlainMapSTypeDefn( PlainMapSTypeDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainMapSTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapSTypeDefn& operator =( + FASTDDS_EXPORTED_API PlainMapSTypeDefn& operator =( const PlainMapSTypeDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainMapSTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapSTypeDefn& operator =( + FASTDDS_EXPORTED_API PlainMapSTypeDefn& operator =( PlainMapSTypeDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -1003,7 +1003,7 @@ class PlainMapSTypeDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -1013,7 +1013,7 @@ class PlainMapSTypeDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -1022,7 +1022,7 @@ class PlainMapSTypeDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -1031,7 +1031,7 @@ class PlainMapSTypeDefn final * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( SBound _bound) { m_bound = _bound; @@ -1041,7 +1041,7 @@ class PlainMapSTypeDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline SBound bound() const + FASTDDS_EXPORTED_API inline SBound bound() const { return m_bound; } @@ -1050,7 +1050,7 @@ class PlainMapSTypeDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline SBound& bound() + FASTDDS_EXPORTED_API inline SBound& bound() { return m_bound; } @@ -1059,14 +1059,14 @@ class PlainMapSTypeDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -1075,7 +1075,7 @@ class PlainMapSTypeDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } @@ -1084,7 +1084,7 @@ class PlainMapSTypeDefn final * @brief This function sets a value in member key_flags * @param _key_flags New value for member key_flags */ - RTPS_DllAPI inline void key_flags( + FASTDDS_EXPORTED_API inline void key_flags( CollectionElementFlag _key_flags) { m_key_flags = _key_flags; @@ -1094,7 +1094,7 @@ class PlainMapSTypeDefn final * @brief This function returns the value of member key_flags * @return Value of member key_flags */ - RTPS_DllAPI inline CollectionElementFlag key_flags() const + FASTDDS_EXPORTED_API inline CollectionElementFlag key_flags() const { return m_key_flags; } @@ -1103,7 +1103,7 @@ class PlainMapSTypeDefn final * @brief This function returns a reference to member key_flags * @return Reference to member key_flags */ - RTPS_DllAPI inline CollectionElementFlag& key_flags() + FASTDDS_EXPORTED_API inline CollectionElementFlag& key_flags() { return m_key_flags; } @@ -1112,14 +1112,14 @@ class PlainMapSTypeDefn final * @brief This function sets a value in member key_identifier * @param _key_identifier New value for member key_identifier */ - RTPS_DllAPI void key_identifier( + FASTDDS_EXPORTED_API void key_identifier( const TypeIdentifier* _key_identifier); /*! * @brief This function returns the value of member key_identifier * @return Value of member key_identifier */ - RTPS_DllAPI inline const TypeIdentifier* key_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* key_identifier() const { return m_key_identifier; } @@ -1128,12 +1128,12 @@ class PlainMapSTypeDefn final * @brief This function returns a reference to member key_identifier * @return Reference to member key_identifier */ - RTPS_DllAPI inline TypeIdentifier* key_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* key_identifier() { return m_key_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainMapSTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1156,46 +1156,46 @@ class PlainMapLTypeDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI PlainMapLTypeDefn(); + FASTDDS_EXPORTED_API PlainMapLTypeDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~PlainMapLTypeDefn(); + FASTDDS_EXPORTED_API ~PlainMapLTypeDefn(); /*! * @brief Copy constructor. * @param x Reference to the object PlainMapLTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapLTypeDefn( + FASTDDS_EXPORTED_API PlainMapLTypeDefn( const PlainMapLTypeDefn& x); /*! * @brief Move constructor. * @param x Reference to the object PlainMapLTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapLTypeDefn( + FASTDDS_EXPORTED_API PlainMapLTypeDefn( PlainMapLTypeDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object PlainMapLTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapLTypeDefn& operator =( + FASTDDS_EXPORTED_API PlainMapLTypeDefn& operator =( const PlainMapLTypeDefn& x); /*! * @brief Move assignment. * @param x Reference to the object PlainMapLTypeDefn that will be copied. */ - RTPS_DllAPI PlainMapLTypeDefn& operator =( + FASTDDS_EXPORTED_API PlainMapLTypeDefn& operator =( PlainMapLTypeDefn&& x); /*! * @brief This function copies the value in member header * @param _header New value to be copied in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const PlainCollectionHeader& _header) { m_header = _header; @@ -1205,7 +1205,7 @@ class PlainMapLTypeDefn final * @brief This function moves the value in member header * @param _header New value to be moved in member header */ - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( PlainCollectionHeader&& _header) { m_header = std::move(_header); @@ -1215,7 +1215,7 @@ class PlainMapLTypeDefn final * @brief This function returns a constant reference to member header * @return Constant reference to member header */ - RTPS_DllAPI inline const PlainCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const PlainCollectionHeader& header() const { return m_header; } @@ -1224,7 +1224,7 @@ class PlainMapLTypeDefn final * @brief This function returns a reference to member header * @return Reference to member header */ - RTPS_DllAPI inline PlainCollectionHeader& header() + FASTDDS_EXPORTED_API inline PlainCollectionHeader& header() { return m_header; } @@ -1233,7 +1233,7 @@ class PlainMapLTypeDefn final * @brief This function sets a value in member bound * @param _bound New value for member bound */ - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( LBound _bound) { m_bound = _bound; @@ -1243,7 +1243,7 @@ class PlainMapLTypeDefn final * @brief This function returns the value of member bound * @return Value of member bound */ - RTPS_DllAPI inline LBound bound() const + FASTDDS_EXPORTED_API inline LBound bound() const { return m_bound; } @@ -1252,7 +1252,7 @@ class PlainMapLTypeDefn final * @brief This function returns a reference to member bound * @return Reference to member bound */ - RTPS_DllAPI inline LBound& bound() + FASTDDS_EXPORTED_API inline LBound& bound() { return m_bound; } @@ -1261,14 +1261,14 @@ class PlainMapLTypeDefn final * @brief This function sets a value in member element_identifier * @param _element_identifier New value for member element_identifier */ - RTPS_DllAPI void element_identifier( + FASTDDS_EXPORTED_API void element_identifier( const TypeIdentifier* _element_identifier); /*! * @brief This function returns the value of member element_identifier * @return Value of member element_identifier */ - RTPS_DllAPI inline const TypeIdentifier* element_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* element_identifier() const { return m_element_identifier; } @@ -1277,7 +1277,7 @@ class PlainMapLTypeDefn final * @brief This function returns a reference to member element_identifier * @return Reference to member element_identifier */ - RTPS_DllAPI inline TypeIdentifier* element_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* element_identifier() { return m_element_identifier; } @@ -1286,7 +1286,7 @@ class PlainMapLTypeDefn final * @brief This function sets a value in member key_flags * @param _key_flags New value for member key_flags */ - RTPS_DllAPI inline void key_flags( + FASTDDS_EXPORTED_API inline void key_flags( CollectionElementFlag _key_flags) { m_key_flags = _key_flags; @@ -1296,7 +1296,7 @@ class PlainMapLTypeDefn final * @brief This function returns the value of member key_flags * @return Value of member key_flags */ - RTPS_DllAPI inline CollectionElementFlag key_flags() const + FASTDDS_EXPORTED_API inline CollectionElementFlag key_flags() const { return m_key_flags; } @@ -1305,7 +1305,7 @@ class PlainMapLTypeDefn final * @brief This function returns a reference to member key_flags * @return Reference to member key_flags */ - RTPS_DllAPI inline CollectionElementFlag& key_flags() + FASTDDS_EXPORTED_API inline CollectionElementFlag& key_flags() { return m_key_flags; } @@ -1314,14 +1314,14 @@ class PlainMapLTypeDefn final * @brief This function sets a value in member key_identifier * @param _key_identifier New value for member key_identifier */ - RTPS_DllAPI void key_identifier( + FASTDDS_EXPORTED_API void key_identifier( const TypeIdentifier* _key_identifier); /*! * @brief This function returns the value of member key_identifier * @return Value of member key_identifier */ - RTPS_DllAPI inline const TypeIdentifier* key_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier* key_identifier() const { return m_key_identifier; } @@ -1330,12 +1330,12 @@ class PlainMapLTypeDefn final * @brief This function returns a reference to member key_identifier * @return Reference to member key_identifier */ - RTPS_DllAPI inline TypeIdentifier* key_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier* key_identifier() { return m_key_identifier; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const PlainMapLTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1358,46 +1358,46 @@ class StronglyConnectedComponentId final /*! * @brief Default constructor. */ - RTPS_DllAPI StronglyConnectedComponentId(); + FASTDDS_EXPORTED_API StronglyConnectedComponentId(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~StronglyConnectedComponentId(); + FASTDDS_EXPORTED_API ~StronglyConnectedComponentId(); /*! * @brief Copy constructor. * @param x Reference to the object StronglyConnectedComponentId that will be copied. */ - RTPS_DllAPI StronglyConnectedComponentId( + FASTDDS_EXPORTED_API StronglyConnectedComponentId( const StronglyConnectedComponentId& x); /*! * @brief Move constructor. * @param x Reference to the object StronglyConnectedComponentId that will be copied. */ - RTPS_DllAPI StronglyConnectedComponentId( + FASTDDS_EXPORTED_API StronglyConnectedComponentId( StronglyConnectedComponentId&& x); /*! * @brief Copy assignment. * @param x Reference to the object StronglyConnectedComponentId that will be copied. */ - RTPS_DllAPI StronglyConnectedComponentId& operator =( + FASTDDS_EXPORTED_API StronglyConnectedComponentId& operator =( const StronglyConnectedComponentId& x); /*! * @brief Move assignment. * @param x Reference to the object StronglyConnectedComponentId that will be copied. */ - RTPS_DllAPI StronglyConnectedComponentId& operator =( + FASTDDS_EXPORTED_API StronglyConnectedComponentId& operator =( StronglyConnectedComponentId&& x); /*! * @brief This function copies the value in member sc_component_id * @param _sc_component_id New value to be copied in member sc_component_id */ - RTPS_DllAPI inline void sc_component_id( + FASTDDS_EXPORTED_API inline void sc_component_id( const TypeObjectHashId& _sc_component_id) { m_sc_component_id = _sc_component_id; @@ -1407,7 +1407,7 @@ class StronglyConnectedComponentId final * @brief This function moves the value in member sc_component_id * @param _sc_component_id New value to be moved in member sc_component_id */ - RTPS_DllAPI inline void sc_component_id( + FASTDDS_EXPORTED_API inline void sc_component_id( TypeObjectHashId&& _sc_component_id) { m_sc_component_id = std::move(_sc_component_id); @@ -1417,7 +1417,7 @@ class StronglyConnectedComponentId final * @brief This function returns a constant reference to member sc_component_id * @return Constant reference to member sc_component_id */ - RTPS_DllAPI inline const TypeObjectHashId& sc_component_id() const + FASTDDS_EXPORTED_API inline const TypeObjectHashId& sc_component_id() const { return m_sc_component_id; } @@ -1426,7 +1426,7 @@ class StronglyConnectedComponentId final * @brief This function returns a reference to member sc_component_id * @return Reference to member sc_component_id */ - RTPS_DllAPI inline TypeObjectHashId& sc_component_id() + FASTDDS_EXPORTED_API inline TypeObjectHashId& sc_component_id() { return m_sc_component_id; } @@ -1435,7 +1435,7 @@ class StronglyConnectedComponentId final * @brief This function sets a value in member scc_length * @param _scc_length New value for member scc_length */ - RTPS_DllAPI inline void scc_length( + FASTDDS_EXPORTED_API inline void scc_length( int32_t _scc_length) { m_scc_length = _scc_length; @@ -1445,7 +1445,7 @@ class StronglyConnectedComponentId final * @brief This function returns the value of member scc_length * @return Value of member scc_length */ - RTPS_DllAPI inline int32_t scc_length() const + FASTDDS_EXPORTED_API inline int32_t scc_length() const { return m_scc_length; } @@ -1454,7 +1454,7 @@ class StronglyConnectedComponentId final * @brief This function returns a reference to member scc_length * @return Reference to member scc_length */ - RTPS_DllAPI inline int32_t& scc_length() + FASTDDS_EXPORTED_API inline int32_t& scc_length() { return m_scc_length; } @@ -1463,7 +1463,7 @@ class StronglyConnectedComponentId final * @brief This function sets a value in member scc_index * @param _scc_index New value for member scc_index */ - RTPS_DllAPI inline void scc_index( + FASTDDS_EXPORTED_API inline void scc_index( int32_t _scc_index) { m_scc_index = _scc_index; @@ -1473,7 +1473,7 @@ class StronglyConnectedComponentId final * @brief This function returns the value of member scc_index * @return Value of member scc_index */ - RTPS_DllAPI inline int32_t scc_index() const + FASTDDS_EXPORTED_API inline int32_t scc_index() const { return m_scc_index; } @@ -1482,12 +1482,12 @@ class StronglyConnectedComponentId final * @brief This function returns a reference to member scc_index * @return Reference to member scc_index */ - RTPS_DllAPI inline int32_t& scc_index() + FASTDDS_EXPORTED_API inline int32_t& scc_index() { return m_scc_index; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const StronglyConnectedComponentId& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1508,42 +1508,42 @@ class ExtendedTypeDefn final /*! * @brief Default constructor. */ - RTPS_DllAPI ExtendedTypeDefn(); + FASTDDS_EXPORTED_API ExtendedTypeDefn(); /*! * @brief Default destructor. */ - RTPS_DllAPI virtual ~ExtendedTypeDefn(); + FASTDDS_EXPORTED_API virtual ~ExtendedTypeDefn(); /*! * @brief Copy constructor. * @param x Reference to the object ExtendedTypeDefn that will be copied. */ - RTPS_DllAPI ExtendedTypeDefn( + FASTDDS_EXPORTED_API ExtendedTypeDefn( const ExtendedTypeDefn& x); /*! * @brief Move constructor. * @param x Reference to the object ExtendedTypeDefn that will be copied. */ - RTPS_DllAPI ExtendedTypeDefn( + FASTDDS_EXPORTED_API ExtendedTypeDefn( ExtendedTypeDefn&& x); /*! * @brief Copy assignment. * @param x Reference to the object ExtendedTypeDefn that will be copied. */ - RTPS_DllAPI virtual ExtendedTypeDefn& operator =( + FASTDDS_EXPORTED_API virtual ExtendedTypeDefn& operator =( const ExtendedTypeDefn& x); /*! * @brief Move assignment. * @param x Reference to the object ExtendedTypeDefn that will be copied. */ - RTPS_DllAPI virtual ExtendedTypeDefn& operator =( + FASTDDS_EXPORTED_API virtual ExtendedTypeDefn& operator =( ExtendedTypeDefn&& x); - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const ExtendedTypeDefn& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; diff --git a/include/fastrtps/types/TypeNamesGenerator.h b/include/fastrtps/types/TypeNamesGenerator.h index eeb3d195da9..c81f90c9176 100644 --- a/include/fastrtps/types/TypeNamesGenerator.h +++ b/include/fastrtps/types/TypeNamesGenerator.h @@ -1,7 +1,7 @@ #ifndef _TYPE_NAMES_GENERATOR_ #define _TYPE_NAMES_GENERATOR_ -#include +#include #include #include @@ -15,28 +15,28 @@ class TypeNamesGenerator { public: - RTPS_DllAPI static std::string get_string_type_name( + FASTDDS_EXPORTED_API static std::string get_string_type_name( uint32_t bound, bool wide, bool generate_identifier = true); - RTPS_DllAPI static std::string get_sequence_type_name( + FASTDDS_EXPORTED_API static std::string get_sequence_type_name( const std::string& type_name, uint32_t bound, bool generate_identifier = true); - RTPS_DllAPI static std::string get_array_type_name( + FASTDDS_EXPORTED_API static std::string get_array_type_name( const std::string& type_name, const std::vector& bound, bool generate_identifier = true); - RTPS_DllAPI static std::string get_array_type_name( + FASTDDS_EXPORTED_API static std::string get_array_type_name( const std::string& type_name, const std::vector& bound, uint32_t& ret_size, bool generate_identifier = true); - RTPS_DllAPI static std::string get_map_type_name( + FASTDDS_EXPORTED_API static std::string get_map_type_name( const std::string& key_type_name, const std::string& value_type_name, uint32_t bound, diff --git a/include/fastrtps/types/TypeObject.h b/include/fastrtps/types/TypeObject.h index 6e2e9db2723..657324fa4f4 100644 --- a/include/fastrtps/types/TypeObject.h +++ b/include/fastrtps/types/TypeObject.h @@ -44,87 +44,87 @@ class CommonStructMember { public: - RTPS_DllAPI CommonStructMember(); - RTPS_DllAPI ~CommonStructMember(); - RTPS_DllAPI CommonStructMember( + FASTDDS_EXPORTED_API CommonStructMember(); + FASTDDS_EXPORTED_API ~CommonStructMember(); + FASTDDS_EXPORTED_API CommonStructMember( const CommonStructMember& x); - RTPS_DllAPI CommonStructMember( + FASTDDS_EXPORTED_API CommonStructMember( CommonStructMember&& x); - RTPS_DllAPI CommonStructMember& operator =( + FASTDDS_EXPORTED_API CommonStructMember& operator =( const CommonStructMember& x); - RTPS_DllAPI CommonStructMember& operator =( + FASTDDS_EXPORTED_API CommonStructMember& operator =( CommonStructMember&& x); - RTPS_DllAPI inline void member_id( + FASTDDS_EXPORTED_API inline void member_id( const MemberId& _member_id) { m_member_id = _member_id; } - RTPS_DllAPI inline void member_id( + FASTDDS_EXPORTED_API inline void member_id( MemberId&& _member_id) { m_member_id = std::move(_member_id); } - RTPS_DllAPI inline const MemberId& member_id() const + FASTDDS_EXPORTED_API inline const MemberId& member_id() const { return m_member_id; } - RTPS_DllAPI inline MemberId& member_id() + FASTDDS_EXPORTED_API inline MemberId& member_id() { return m_member_id; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( const StructMemberFlag& _member_flags) { m_member_flags = _member_flags; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( StructMemberFlag&& _member_flags) { m_member_flags = std::move(_member_flags); } - RTPS_DllAPI inline const StructMemberFlag& member_flags() const + FASTDDS_EXPORTED_API inline const StructMemberFlag& member_flags() const { return m_member_flags; } - RTPS_DllAPI inline StructMemberFlag& member_flags() + FASTDDS_EXPORTED_API inline StructMemberFlag& member_flags() { return m_member_flags; } - RTPS_DllAPI inline void member_type_id( + FASTDDS_EXPORTED_API inline void member_type_id( const TypeIdentifier& _member_type_id) { m_member_type_id = _member_type_id; } - RTPS_DllAPI inline void member_type_id( + FASTDDS_EXPORTED_API inline void member_type_id( TypeIdentifier&& _member_type_id) { m_member_type_id = std::move(_member_type_id); } - RTPS_DllAPI inline const TypeIdentifier& member_type_id() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& member_type_id() const { return m_member_type_id; } - RTPS_DllAPI inline TypeIdentifier& member_type_id() + FASTDDS_EXPORTED_API inline TypeIdentifier& member_type_id() { return m_member_type_id; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonStructMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonStructMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -145,87 +145,87 @@ class CompleteMemberDetail { public: - RTPS_DllAPI CompleteMemberDetail(); - RTPS_DllAPI ~CompleteMemberDetail(); - RTPS_DllAPI CompleteMemberDetail( + FASTDDS_EXPORTED_API CompleteMemberDetail(); + FASTDDS_EXPORTED_API ~CompleteMemberDetail(); + FASTDDS_EXPORTED_API CompleteMemberDetail( const CompleteMemberDetail& x); - RTPS_DllAPI CompleteMemberDetail( + FASTDDS_EXPORTED_API CompleteMemberDetail( CompleteMemberDetail&& x); - RTPS_DllAPI CompleteMemberDetail& operator =( + FASTDDS_EXPORTED_API CompleteMemberDetail& operator =( const CompleteMemberDetail& x); - RTPS_DllAPI CompleteMemberDetail& operator =( + FASTDDS_EXPORTED_API CompleteMemberDetail& operator =( CompleteMemberDetail&& x); - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( const MemberName& _name) { m_name = _name; } - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( MemberName&& _name) { m_name = std::move(_name); } - RTPS_DllAPI inline const MemberName& name() const + FASTDDS_EXPORTED_API inline const MemberName& name() const { return m_name; } - RTPS_DllAPI inline MemberName& name() + FASTDDS_EXPORTED_API inline MemberName& name() { return m_name; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( const AppliedBuiltinMemberAnnotations& _ann_builtin) { m_ann_builtin = _ann_builtin; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( AppliedBuiltinMemberAnnotations&& _ann_builtin) { m_ann_builtin = std::move(_ann_builtin); } - RTPS_DllAPI inline const AppliedBuiltinMemberAnnotations& ann_builtin() const + FASTDDS_EXPORTED_API inline const AppliedBuiltinMemberAnnotations& ann_builtin() const { return m_ann_builtin; } - RTPS_DllAPI inline AppliedBuiltinMemberAnnotations& ann_builtin() + FASTDDS_EXPORTED_API inline AppliedBuiltinMemberAnnotations& ann_builtin() { return m_ann_builtin; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( const AppliedAnnotationSeq& _ann_custom) { m_ann_custom = _ann_custom; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( AppliedAnnotationSeq&& _ann_custom) { m_ann_custom = std::move(_ann_custom); } - RTPS_DllAPI inline const AppliedAnnotationSeq& ann_custom() const + FASTDDS_EXPORTED_API inline const AppliedAnnotationSeq& ann_custom() const { return m_ann_custom; } - RTPS_DllAPI inline AppliedAnnotationSeq& ann_custom() + FASTDDS_EXPORTED_API inline AppliedAnnotationSeq& ann_custom() { return m_ann_custom; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteMemberDetail& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteMemberDetail& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -245,43 +245,43 @@ class MinimalMemberDetail final { public: - RTPS_DllAPI MinimalMemberDetail(); - RTPS_DllAPI ~MinimalMemberDetail(); - RTPS_DllAPI MinimalMemberDetail( + FASTDDS_EXPORTED_API MinimalMemberDetail(); + FASTDDS_EXPORTED_API ~MinimalMemberDetail(); + FASTDDS_EXPORTED_API MinimalMemberDetail( const MinimalMemberDetail& x); - RTPS_DllAPI MinimalMemberDetail( + FASTDDS_EXPORTED_API MinimalMemberDetail( MinimalMemberDetail&& x); - RTPS_DllAPI MinimalMemberDetail& operator =( + FASTDDS_EXPORTED_API MinimalMemberDetail& operator =( const MinimalMemberDetail& x); - RTPS_DllAPI MinimalMemberDetail& operator =( + FASTDDS_EXPORTED_API MinimalMemberDetail& operator =( MinimalMemberDetail&& x); - RTPS_DllAPI inline void name_hash( + FASTDDS_EXPORTED_API inline void name_hash( const NameHash& _name_hash) { m_name_hash = _name_hash; } - RTPS_DllAPI inline void name_hash( + FASTDDS_EXPORTED_API inline void name_hash( NameHash&& _name_hash) { m_name_hash = std::move(_name_hash); } - RTPS_DllAPI inline const NameHash& name_hash() const + FASTDDS_EXPORTED_API inline const NameHash& name_hash() const { return m_name_hash; } - RTPS_DllAPI inline NameHash& name_hash() + FASTDDS_EXPORTED_API inline NameHash& name_hash() { return m_name_hash; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalMemberDetail& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalMemberDetail& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -299,65 +299,65 @@ class CompleteStructMember { public: - RTPS_DllAPI CompleteStructMember(); - RTPS_DllAPI ~CompleteStructMember(); - RTPS_DllAPI CompleteStructMember( + FASTDDS_EXPORTED_API CompleteStructMember(); + FASTDDS_EXPORTED_API ~CompleteStructMember(); + FASTDDS_EXPORTED_API CompleteStructMember( const CompleteStructMember& x); - RTPS_DllAPI CompleteStructMember( + FASTDDS_EXPORTED_API CompleteStructMember( CompleteStructMember&& x); - RTPS_DllAPI CompleteStructMember& operator =( + FASTDDS_EXPORTED_API CompleteStructMember& operator =( const CompleteStructMember& x); - RTPS_DllAPI CompleteStructMember& operator =( + FASTDDS_EXPORTED_API CompleteStructMember& operator =( CompleteStructMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonStructMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonStructMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonStructMember& common() const + FASTDDS_EXPORTED_API inline const CommonStructMember& common() const { return m_common; } - RTPS_DllAPI inline CommonStructMember& common() + FASTDDS_EXPORTED_API inline CommonStructMember& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteMemberDetail& detail() + FASTDDS_EXPORTED_API inline CompleteMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteStructMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteStructMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -379,65 +379,65 @@ class MinimalStructMember { public: - RTPS_DllAPI MinimalStructMember(); - RTPS_DllAPI ~MinimalStructMember(); - RTPS_DllAPI MinimalStructMember( + FASTDDS_EXPORTED_API MinimalStructMember(); + FASTDDS_EXPORTED_API ~MinimalStructMember(); + FASTDDS_EXPORTED_API MinimalStructMember( const MinimalStructMember& x); - RTPS_DllAPI MinimalStructMember( + FASTDDS_EXPORTED_API MinimalStructMember( MinimalStructMember&& x); - RTPS_DllAPI MinimalStructMember& operator =( + FASTDDS_EXPORTED_API MinimalStructMember& operator =( const MinimalStructMember& x); - RTPS_DllAPI MinimalStructMember& operator =( + FASTDDS_EXPORTED_API MinimalStructMember& operator =( MinimalStructMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonStructMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonStructMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonStructMember& common() const + FASTDDS_EXPORTED_API inline const CommonStructMember& common() const { return m_common; } - RTPS_DllAPI inline CommonStructMember& common() + FASTDDS_EXPORTED_API inline CommonStructMember& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalMemberDetail& detail() + FASTDDS_EXPORTED_API inline MinimalMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalStructMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalStructMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -457,43 +457,43 @@ class AppliedBuiltinTypeAnnotations { public: - RTPS_DllAPI AppliedBuiltinTypeAnnotations(); - RTPS_DllAPI ~AppliedBuiltinTypeAnnotations(); - RTPS_DllAPI AppliedBuiltinTypeAnnotations( + FASTDDS_EXPORTED_API AppliedBuiltinTypeAnnotations(); + FASTDDS_EXPORTED_API ~AppliedBuiltinTypeAnnotations(); + FASTDDS_EXPORTED_API AppliedBuiltinTypeAnnotations( const AppliedBuiltinTypeAnnotations& x); - RTPS_DllAPI AppliedBuiltinTypeAnnotations( + FASTDDS_EXPORTED_API AppliedBuiltinTypeAnnotations( AppliedBuiltinTypeAnnotations&& x); - RTPS_DllAPI AppliedBuiltinTypeAnnotations& operator =( + FASTDDS_EXPORTED_API AppliedBuiltinTypeAnnotations& operator =( const AppliedBuiltinTypeAnnotations& x); - RTPS_DllAPI AppliedBuiltinTypeAnnotations& operator =( + FASTDDS_EXPORTED_API AppliedBuiltinTypeAnnotations& operator =( AppliedBuiltinTypeAnnotations&& x); - RTPS_DllAPI inline void verbatim( + FASTDDS_EXPORTED_API inline void verbatim( const AppliedVerbatimAnnotation& _verbatim) { m_verbatim = _verbatim; } - RTPS_DllAPI inline void verbatim( + FASTDDS_EXPORTED_API inline void verbatim( AppliedVerbatimAnnotation&& _verbatim) { m_verbatim = std::move(_verbatim); } - RTPS_DllAPI inline const AppliedVerbatimAnnotation& verbatim() const + FASTDDS_EXPORTED_API inline const AppliedVerbatimAnnotation& verbatim() const { return m_verbatim; } - RTPS_DllAPI inline AppliedVerbatimAnnotation& verbatim() + FASTDDS_EXPORTED_API inline AppliedVerbatimAnnotation& verbatim() { return m_verbatim; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const AppliedBuiltinTypeAnnotations& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const AppliedBuiltinTypeAnnotations& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -509,24 +509,24 @@ class MinimalTypeDetail { public: - RTPS_DllAPI MinimalTypeDetail(); - RTPS_DllAPI ~MinimalTypeDetail(); - RTPS_DllAPI MinimalTypeDetail( + FASTDDS_EXPORTED_API MinimalTypeDetail(); + FASTDDS_EXPORTED_API ~MinimalTypeDetail(); + FASTDDS_EXPORTED_API MinimalTypeDetail( const MinimalTypeDetail& x); - RTPS_DllAPI MinimalTypeDetail( + FASTDDS_EXPORTED_API MinimalTypeDetail( MinimalTypeDetail&& x); - RTPS_DllAPI MinimalTypeDetail& operator =( + FASTDDS_EXPORTED_API MinimalTypeDetail& operator =( const MinimalTypeDetail& x); - RTPS_DllAPI MinimalTypeDetail& operator =( + FASTDDS_EXPORTED_API MinimalTypeDetail& operator =( MinimalTypeDetail&& x); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalTypeDetail&) const { return true; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalTypeDetail& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -543,87 +543,87 @@ class CompleteTypeDetail { public: - RTPS_DllAPI CompleteTypeDetail(); - RTPS_DllAPI ~CompleteTypeDetail(); - RTPS_DllAPI CompleteTypeDetail( + FASTDDS_EXPORTED_API CompleteTypeDetail(); + FASTDDS_EXPORTED_API ~CompleteTypeDetail(); + FASTDDS_EXPORTED_API CompleteTypeDetail( const CompleteTypeDetail& x); - RTPS_DllAPI CompleteTypeDetail( + FASTDDS_EXPORTED_API CompleteTypeDetail( CompleteTypeDetail&& x); - RTPS_DllAPI CompleteTypeDetail& operator =( + FASTDDS_EXPORTED_API CompleteTypeDetail& operator =( const CompleteTypeDetail& x); - RTPS_DllAPI CompleteTypeDetail& operator =( + FASTDDS_EXPORTED_API CompleteTypeDetail& operator =( CompleteTypeDetail&& x); - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( const AppliedBuiltinTypeAnnotations& _ann_builtin) { m_ann_builtin = _ann_builtin; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( AppliedBuiltinTypeAnnotations&& _ann_builtin) { m_ann_builtin = std::move(_ann_builtin); } - RTPS_DllAPI inline const AppliedBuiltinTypeAnnotations& ann_builtin() const + FASTDDS_EXPORTED_API inline const AppliedBuiltinTypeAnnotations& ann_builtin() const { return m_ann_builtin; } - RTPS_DllAPI inline AppliedBuiltinTypeAnnotations& ann_builtin() + FASTDDS_EXPORTED_API inline AppliedBuiltinTypeAnnotations& ann_builtin() { return m_ann_builtin; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( const AppliedAnnotationSeq& _ann_custom) { m_ann_custom = _ann_custom; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( AppliedAnnotationSeq&& _ann_custom) { m_ann_custom = std::move(_ann_custom); } - RTPS_DllAPI inline const AppliedAnnotationSeq& ann_custom() const + FASTDDS_EXPORTED_API inline const AppliedAnnotationSeq& ann_custom() const { return m_ann_custom; } - RTPS_DllAPI inline AppliedAnnotationSeq& ann_custom() + FASTDDS_EXPORTED_API inline AppliedAnnotationSeq& ann_custom() { return m_ann_custom; } - RTPS_DllAPI inline void type_name( + FASTDDS_EXPORTED_API inline void type_name( const QualifiedTypeName& _type_name) { m_type_name = _type_name; } - RTPS_DllAPI inline void type_name( + FASTDDS_EXPORTED_API inline void type_name( QualifiedTypeName&& _type_name) { m_type_name = std::move(_type_name); } - RTPS_DllAPI inline const QualifiedTypeName& type_name() const + FASTDDS_EXPORTED_API inline const QualifiedTypeName& type_name() const { return m_type_name; } - RTPS_DllAPI inline QualifiedTypeName& type_name() + FASTDDS_EXPORTED_API inline QualifiedTypeName& type_name() { return m_type_name; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteTypeDetail& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteTypeDetail& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -641,65 +641,65 @@ class CompleteStructHeader { public: - RTPS_DllAPI CompleteStructHeader(); - RTPS_DllAPI ~CompleteStructHeader(); - RTPS_DllAPI CompleteStructHeader( + FASTDDS_EXPORTED_API CompleteStructHeader(); + FASTDDS_EXPORTED_API ~CompleteStructHeader(); + FASTDDS_EXPORTED_API CompleteStructHeader( const CompleteStructHeader& x); - RTPS_DllAPI CompleteStructHeader( + FASTDDS_EXPORTED_API CompleteStructHeader( CompleteStructHeader&& x); - RTPS_DllAPI CompleteStructHeader& operator =( + FASTDDS_EXPORTED_API CompleteStructHeader& operator =( const CompleteStructHeader& x); - RTPS_DllAPI CompleteStructHeader& operator =( + FASTDDS_EXPORTED_API CompleteStructHeader& operator =( CompleteStructHeader&& x); - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( const TypeIdentifier& _base_type) { m_base_type = _base_type; } - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( TypeIdentifier&& _base_type) { m_base_type = std::move(_base_type); } - RTPS_DllAPI inline const TypeIdentifier& base_type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& base_type() const { return m_base_type; } - RTPS_DllAPI inline TypeIdentifier& base_type() + FASTDDS_EXPORTED_API inline TypeIdentifier& base_type() { return m_base_type; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteStructHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteStructHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -716,65 +716,65 @@ class MinimalStructHeader { public: - RTPS_DllAPI MinimalStructHeader(); - RTPS_DllAPI ~MinimalStructHeader(); - RTPS_DllAPI MinimalStructHeader( + FASTDDS_EXPORTED_API MinimalStructHeader(); + FASTDDS_EXPORTED_API ~MinimalStructHeader(); + FASTDDS_EXPORTED_API MinimalStructHeader( const MinimalStructHeader& x); - RTPS_DllAPI MinimalStructHeader( + FASTDDS_EXPORTED_API MinimalStructHeader( MinimalStructHeader&& x); - RTPS_DllAPI MinimalStructHeader& operator =( + FASTDDS_EXPORTED_API MinimalStructHeader& operator =( const MinimalStructHeader& x); - RTPS_DllAPI MinimalStructHeader& operator =( + FASTDDS_EXPORTED_API MinimalStructHeader& operator =( MinimalStructHeader&& x); - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( const TypeIdentifier& _base_type) { m_base_type = _base_type; } - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( TypeIdentifier&& _base_type) { m_base_type = std::move(_base_type); } - RTPS_DllAPI inline const TypeIdentifier& base_type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& base_type() const { return m_base_type; } - RTPS_DllAPI inline TypeIdentifier& base_type() + FASTDDS_EXPORTED_API inline TypeIdentifier& base_type() { return m_base_type; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalTypeDetail& detail() + FASTDDS_EXPORTED_API inline MinimalTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalStructHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalStructHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -793,87 +793,87 @@ class CompleteStructType { public: - RTPS_DllAPI CompleteStructType(); - RTPS_DllAPI ~CompleteStructType(); - RTPS_DllAPI CompleteStructType( + FASTDDS_EXPORTED_API CompleteStructType(); + FASTDDS_EXPORTED_API ~CompleteStructType(); + FASTDDS_EXPORTED_API CompleteStructType( const CompleteStructType& x); - RTPS_DllAPI CompleteStructType( + FASTDDS_EXPORTED_API CompleteStructType( CompleteStructType&& x); - RTPS_DllAPI CompleteStructType& operator =( + FASTDDS_EXPORTED_API CompleteStructType& operator =( const CompleteStructType& x); - RTPS_DllAPI CompleteStructType& operator =( + FASTDDS_EXPORTED_API CompleteStructType& operator =( CompleteStructType&& x); - RTPS_DllAPI inline void struct_flags( + FASTDDS_EXPORTED_API inline void struct_flags( const StructTypeFlag& _struct_flags) { m_struct_flags = _struct_flags; } - RTPS_DllAPI inline void struct_flags( + FASTDDS_EXPORTED_API inline void struct_flags( StructTypeFlag&& _struct_flags) { m_struct_flags = std::move(_struct_flags); } - RTPS_DllAPI inline const StructTypeFlag& struct_flags() const + FASTDDS_EXPORTED_API inline const StructTypeFlag& struct_flags() const { return m_struct_flags; } - RTPS_DllAPI inline StructTypeFlag& struct_flags() + FASTDDS_EXPORTED_API inline StructTypeFlag& struct_flags() { return m_struct_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteStructHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteStructHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteStructHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteStructHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteStructHeader& header() + FASTDDS_EXPORTED_API inline CompleteStructHeader& header() { return m_header; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const CompleteStructMemberSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( CompleteStructMemberSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const CompleteStructMemberSeq& member_seq() const + FASTDDS_EXPORTED_API inline const CompleteStructMemberSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline CompleteStructMemberSeq& member_seq() + FASTDDS_EXPORTED_API inline CompleteStructMemberSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteStructType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteStructType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -893,87 +893,87 @@ class MinimalStructType { public: - RTPS_DllAPI MinimalStructType(); - RTPS_DllAPI ~MinimalStructType(); - RTPS_DllAPI MinimalStructType( + FASTDDS_EXPORTED_API MinimalStructType(); + FASTDDS_EXPORTED_API ~MinimalStructType(); + FASTDDS_EXPORTED_API MinimalStructType( const MinimalStructType& x); - RTPS_DllAPI MinimalStructType( + FASTDDS_EXPORTED_API MinimalStructType( MinimalStructType&& x); - RTPS_DllAPI MinimalStructType& operator =( + FASTDDS_EXPORTED_API MinimalStructType& operator =( const MinimalStructType& x); - RTPS_DllAPI MinimalStructType& operator =( + FASTDDS_EXPORTED_API MinimalStructType& operator =( MinimalStructType&& x); - RTPS_DllAPI inline void struct_flags( + FASTDDS_EXPORTED_API inline void struct_flags( const StructTypeFlag& _struct_flags) { m_struct_flags = _struct_flags; } - RTPS_DllAPI inline void struct_flags( + FASTDDS_EXPORTED_API inline void struct_flags( StructTypeFlag&& _struct_flags) { m_struct_flags = std::move(_struct_flags); } - RTPS_DllAPI inline const StructTypeFlag& struct_flags() const + FASTDDS_EXPORTED_API inline const StructTypeFlag& struct_flags() const { return m_struct_flags; } - RTPS_DllAPI inline StructTypeFlag& struct_flags() + FASTDDS_EXPORTED_API inline StructTypeFlag& struct_flags() { return m_struct_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalStructHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalStructHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalStructHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalStructHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalStructHeader& header() + FASTDDS_EXPORTED_API inline MinimalStructHeader& header() { return m_header; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const MinimalStructMemberSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( MinimalStructMemberSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const MinimalStructMemberSeq& member_seq() const + FASTDDS_EXPORTED_API inline const MinimalStructMemberSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline MinimalStructMemberSeq& member_seq() + FASTDDS_EXPORTED_API inline MinimalStructMemberSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalStructType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalStructType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1000,109 +1000,109 @@ class CommonUnionMember { public: - RTPS_DllAPI CommonUnionMember(); - RTPS_DllAPI ~CommonUnionMember(); - RTPS_DllAPI CommonUnionMember( + FASTDDS_EXPORTED_API CommonUnionMember(); + FASTDDS_EXPORTED_API ~CommonUnionMember(); + FASTDDS_EXPORTED_API CommonUnionMember( const CommonUnionMember& x); - RTPS_DllAPI CommonUnionMember( + FASTDDS_EXPORTED_API CommonUnionMember( CommonUnionMember&& x); - RTPS_DllAPI CommonUnionMember& operator =( + FASTDDS_EXPORTED_API CommonUnionMember& operator =( const CommonUnionMember& x); - RTPS_DllAPI CommonUnionMember& operator =( + FASTDDS_EXPORTED_API CommonUnionMember& operator =( CommonUnionMember&& x); - RTPS_DllAPI inline void member_id( + FASTDDS_EXPORTED_API inline void member_id( const MemberId& _member_id) { m_member_id = _member_id; } - RTPS_DllAPI inline void member_id( + FASTDDS_EXPORTED_API inline void member_id( MemberId&& _member_id) { m_member_id = std::move(_member_id); } - RTPS_DllAPI inline const MemberId& member_id() const + FASTDDS_EXPORTED_API inline const MemberId& member_id() const { return m_member_id; } - RTPS_DllAPI inline MemberId& member_id() + FASTDDS_EXPORTED_API inline MemberId& member_id() { return m_member_id; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( const UnionMemberFlag& _member_flags) { m_member_flags = _member_flags; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( UnionMemberFlag&& _member_flags) { m_member_flags = std::move(_member_flags); } - RTPS_DllAPI inline const UnionMemberFlag& member_flags() const + FASTDDS_EXPORTED_API inline const UnionMemberFlag& member_flags() const { return m_member_flags; } - RTPS_DllAPI inline UnionMemberFlag& member_flags() + FASTDDS_EXPORTED_API inline UnionMemberFlag& member_flags() { return m_member_flags; } - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( const TypeIdentifier& _type_id) { m_type_id = _type_id; } - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( TypeIdentifier&& _type_id) { m_type_id = std::move(_type_id); } - RTPS_DllAPI inline const TypeIdentifier& type_id() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_id() const { return m_type_id; } - RTPS_DllAPI inline TypeIdentifier& type_id() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_id() { return m_type_id; } - RTPS_DllAPI inline void label_seq( + FASTDDS_EXPORTED_API inline void label_seq( const UnionCaseLabelSeq& _label_seq) { m_label_seq = _label_seq; } - RTPS_DllAPI inline void label_seq( + FASTDDS_EXPORTED_API inline void label_seq( UnionCaseLabelSeq&& _label_seq) { m_label_seq = std::move(_label_seq); } - RTPS_DllAPI inline const UnionCaseLabelSeq& label_seq() const + FASTDDS_EXPORTED_API inline const UnionCaseLabelSeq& label_seq() const { return m_label_seq; } - RTPS_DllAPI inline UnionCaseLabelSeq& label_seq() + FASTDDS_EXPORTED_API inline UnionCaseLabelSeq& label_seq() { return m_label_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonUnionMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonUnionMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1123,65 +1123,65 @@ class CompleteUnionMember { public: - RTPS_DllAPI CompleteUnionMember(); - RTPS_DllAPI ~CompleteUnionMember(); - RTPS_DllAPI CompleteUnionMember( + FASTDDS_EXPORTED_API CompleteUnionMember(); + FASTDDS_EXPORTED_API ~CompleteUnionMember(); + FASTDDS_EXPORTED_API CompleteUnionMember( const CompleteUnionMember& x); - RTPS_DllAPI CompleteUnionMember( + FASTDDS_EXPORTED_API CompleteUnionMember( CompleteUnionMember&& x); - RTPS_DllAPI CompleteUnionMember& operator =( + FASTDDS_EXPORTED_API CompleteUnionMember& operator =( const CompleteUnionMember& x); - RTPS_DllAPI CompleteUnionMember& operator =( + FASTDDS_EXPORTED_API CompleteUnionMember& operator =( CompleteUnionMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonUnionMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonUnionMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonUnionMember& common() const + FASTDDS_EXPORTED_API inline const CommonUnionMember& common() const { return m_common; } - RTPS_DllAPI inline CommonUnionMember& common() + FASTDDS_EXPORTED_API inline CommonUnionMember& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteMemberDetail& detail() + FASTDDS_EXPORTED_API inline CompleteMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteUnionMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteUnionMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1203,65 +1203,65 @@ class MinimalUnionMember { public: - RTPS_DllAPI MinimalUnionMember(); - RTPS_DllAPI ~MinimalUnionMember(); - RTPS_DllAPI MinimalUnionMember( + FASTDDS_EXPORTED_API MinimalUnionMember(); + FASTDDS_EXPORTED_API ~MinimalUnionMember(); + FASTDDS_EXPORTED_API MinimalUnionMember( const MinimalUnionMember& x); - RTPS_DllAPI MinimalUnionMember( + FASTDDS_EXPORTED_API MinimalUnionMember( MinimalUnionMember&& x); - RTPS_DllAPI MinimalUnionMember& operator =( + FASTDDS_EXPORTED_API MinimalUnionMember& operator =( const MinimalUnionMember& x); - RTPS_DllAPI MinimalUnionMember& operator =( + FASTDDS_EXPORTED_API MinimalUnionMember& operator =( MinimalUnionMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonUnionMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonUnionMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonUnionMember& common() const + FASTDDS_EXPORTED_API inline const CommonUnionMember& common() const { return m_common; } - RTPS_DllAPI inline CommonUnionMember& common() + FASTDDS_EXPORTED_API inline CommonUnionMember& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalMemberDetail& detail() + FASTDDS_EXPORTED_API inline MinimalMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalUnionMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalUnionMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1282,65 +1282,65 @@ class CommonDiscriminatorMember { public: - RTPS_DllAPI CommonDiscriminatorMember(); - RTPS_DllAPI ~CommonDiscriminatorMember(); - RTPS_DllAPI CommonDiscriminatorMember( + FASTDDS_EXPORTED_API CommonDiscriminatorMember(); + FASTDDS_EXPORTED_API ~CommonDiscriminatorMember(); + FASTDDS_EXPORTED_API CommonDiscriminatorMember( const CommonDiscriminatorMember& x); - RTPS_DllAPI CommonDiscriminatorMember( + FASTDDS_EXPORTED_API CommonDiscriminatorMember( CommonDiscriminatorMember&& x); - RTPS_DllAPI CommonDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API CommonDiscriminatorMember& operator =( const CommonDiscriminatorMember& x); - RTPS_DllAPI CommonDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API CommonDiscriminatorMember& operator =( CommonDiscriminatorMember&& x); - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( const UnionDiscriminatorFlag& _member_flags) { m_member_flags = _member_flags; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( UnionDiscriminatorFlag&& _member_flags) { m_member_flags = std::move(_member_flags); } - RTPS_DllAPI inline const UnionDiscriminatorFlag& member_flags() const + FASTDDS_EXPORTED_API inline const UnionDiscriminatorFlag& member_flags() const { return m_member_flags; } - RTPS_DllAPI inline UnionDiscriminatorFlag& member_flags() + FASTDDS_EXPORTED_API inline UnionDiscriminatorFlag& member_flags() { return m_member_flags; } - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( const TypeIdentifier& _type_id) { m_type_id = _type_id; } - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( TypeIdentifier&& _type_id) { m_type_id = std::move(_type_id); } - RTPS_DllAPI inline const TypeIdentifier& type_id() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_id() const { return m_type_id; } - RTPS_DllAPI inline TypeIdentifier& type_id() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_id() { return m_type_id; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonDiscriminatorMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonDiscriminatorMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1360,87 +1360,87 @@ class CompleteDiscriminatorMember { public: - RTPS_DllAPI CompleteDiscriminatorMember(); - RTPS_DllAPI ~CompleteDiscriminatorMember(); - RTPS_DllAPI CompleteDiscriminatorMember( + FASTDDS_EXPORTED_API CompleteDiscriminatorMember(); + FASTDDS_EXPORTED_API ~CompleteDiscriminatorMember(); + FASTDDS_EXPORTED_API CompleteDiscriminatorMember( const CompleteDiscriminatorMember& x); - RTPS_DllAPI CompleteDiscriminatorMember( + FASTDDS_EXPORTED_API CompleteDiscriminatorMember( CompleteDiscriminatorMember&& x); - RTPS_DllAPI CompleteDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API CompleteDiscriminatorMember& operator =( const CompleteDiscriminatorMember& x); - RTPS_DllAPI CompleteDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API CompleteDiscriminatorMember& operator =( CompleteDiscriminatorMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonDiscriminatorMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonDiscriminatorMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonDiscriminatorMember& common() const + FASTDDS_EXPORTED_API inline const CommonDiscriminatorMember& common() const { return m_common; } - RTPS_DllAPI inline CommonDiscriminatorMember& common() + FASTDDS_EXPORTED_API inline CommonDiscriminatorMember& common() { return m_common; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( const AppliedBuiltinTypeAnnotations& _ann_builtin) { m_ann_builtin = _ann_builtin; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( AppliedBuiltinTypeAnnotations&& _ann_builtin) { m_ann_builtin = std::move(_ann_builtin); } - RTPS_DllAPI inline const AppliedBuiltinTypeAnnotations& ann_builtin() const + FASTDDS_EXPORTED_API inline const AppliedBuiltinTypeAnnotations& ann_builtin() const { return m_ann_builtin; } - RTPS_DllAPI inline AppliedBuiltinTypeAnnotations& ann_builtin() + FASTDDS_EXPORTED_API inline AppliedBuiltinTypeAnnotations& ann_builtin() { return m_ann_builtin; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( const AppliedAnnotationSeq& _ann_custom) { m_ann_custom = _ann_custom; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( AppliedAnnotationSeq&& _ann_custom) { m_ann_custom = std::move(_ann_custom); } - RTPS_DllAPI inline const AppliedAnnotationSeq& ann_custom() const + FASTDDS_EXPORTED_API inline const AppliedAnnotationSeq& ann_custom() const { return m_ann_custom; } - RTPS_DllAPI inline AppliedAnnotationSeq& ann_custom() + FASTDDS_EXPORTED_API inline AppliedAnnotationSeq& ann_custom() { return m_ann_custom; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteDiscriminatorMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteDiscriminatorMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1459,43 +1459,43 @@ class MinimalDiscriminatorMember { public: - RTPS_DllAPI MinimalDiscriminatorMember(); - RTPS_DllAPI ~MinimalDiscriminatorMember(); - RTPS_DllAPI MinimalDiscriminatorMember( + FASTDDS_EXPORTED_API MinimalDiscriminatorMember(); + FASTDDS_EXPORTED_API ~MinimalDiscriminatorMember(); + FASTDDS_EXPORTED_API MinimalDiscriminatorMember( const MinimalDiscriminatorMember& x); - RTPS_DllAPI MinimalDiscriminatorMember( + FASTDDS_EXPORTED_API MinimalDiscriminatorMember( MinimalDiscriminatorMember&& x); - RTPS_DllAPI MinimalDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API MinimalDiscriminatorMember& operator =( const MinimalDiscriminatorMember& x); - RTPS_DllAPI MinimalDiscriminatorMember& operator =( + FASTDDS_EXPORTED_API MinimalDiscriminatorMember& operator =( MinimalDiscriminatorMember&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonDiscriminatorMember& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonDiscriminatorMember&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonDiscriminatorMember& common() const + FASTDDS_EXPORTED_API inline const CommonDiscriminatorMember& common() const { return m_common; } - RTPS_DllAPI inline CommonDiscriminatorMember& common() + FASTDDS_EXPORTED_API inline CommonDiscriminatorMember& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalDiscriminatorMember& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalDiscriminatorMember& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1511,43 +1511,43 @@ class CompleteUnionHeader { public: - RTPS_DllAPI CompleteUnionHeader(); - RTPS_DllAPI ~CompleteUnionHeader(); - RTPS_DllAPI CompleteUnionHeader( + FASTDDS_EXPORTED_API CompleteUnionHeader(); + FASTDDS_EXPORTED_API ~CompleteUnionHeader(); + FASTDDS_EXPORTED_API CompleteUnionHeader( const CompleteUnionHeader& x); - RTPS_DllAPI CompleteUnionHeader( + FASTDDS_EXPORTED_API CompleteUnionHeader( CompleteUnionHeader&& x); - RTPS_DllAPI CompleteUnionHeader& operator =( + FASTDDS_EXPORTED_API CompleteUnionHeader& operator =( const CompleteUnionHeader& x); - RTPS_DllAPI CompleteUnionHeader& operator =( + FASTDDS_EXPORTED_API CompleteUnionHeader& operator =( CompleteUnionHeader&& x); - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteUnionHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteUnionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1563,43 +1563,43 @@ class MinimalUnionHeader { public: - RTPS_DllAPI MinimalUnionHeader(); - RTPS_DllAPI ~MinimalUnionHeader(); - RTPS_DllAPI MinimalUnionHeader( + FASTDDS_EXPORTED_API MinimalUnionHeader(); + FASTDDS_EXPORTED_API ~MinimalUnionHeader(); + FASTDDS_EXPORTED_API MinimalUnionHeader( const MinimalUnionHeader& x); - RTPS_DllAPI MinimalUnionHeader( + FASTDDS_EXPORTED_API MinimalUnionHeader( MinimalUnionHeader&& x); - RTPS_DllAPI MinimalUnionHeader& operator =( + FASTDDS_EXPORTED_API MinimalUnionHeader& operator =( const MinimalUnionHeader& x); - RTPS_DllAPI MinimalUnionHeader& operator =( + FASTDDS_EXPORTED_API MinimalUnionHeader& operator =( MinimalUnionHeader&& x); - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalTypeDetail& detail() + FASTDDS_EXPORTED_API inline MinimalTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalUnionHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalUnionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1618,109 +1618,109 @@ class CompleteUnionType { public: - RTPS_DllAPI CompleteUnionType(); - RTPS_DllAPI ~CompleteUnionType(); - RTPS_DllAPI CompleteUnionType( + FASTDDS_EXPORTED_API CompleteUnionType(); + FASTDDS_EXPORTED_API ~CompleteUnionType(); + FASTDDS_EXPORTED_API CompleteUnionType( const CompleteUnionType& x); - RTPS_DllAPI CompleteUnionType( + FASTDDS_EXPORTED_API CompleteUnionType( CompleteUnionType&& x); - RTPS_DllAPI CompleteUnionType& operator =( + FASTDDS_EXPORTED_API CompleteUnionType& operator =( const CompleteUnionType& x); - RTPS_DllAPI CompleteUnionType& operator =( + FASTDDS_EXPORTED_API CompleteUnionType& operator =( CompleteUnionType&& x); - RTPS_DllAPI inline void union_flags( + FASTDDS_EXPORTED_API inline void union_flags( const UnionTypeFlag& _union_flags) { m_union_flags = _union_flags; } - RTPS_DllAPI inline void union_flags( + FASTDDS_EXPORTED_API inline void union_flags( UnionTypeFlag&& _union_flags) { m_union_flags = std::move(_union_flags); } - RTPS_DllAPI inline const UnionTypeFlag& union_flags() const + FASTDDS_EXPORTED_API inline const UnionTypeFlag& union_flags() const { return m_union_flags; } - RTPS_DllAPI inline UnionTypeFlag& union_flags() + FASTDDS_EXPORTED_API inline UnionTypeFlag& union_flags() { return m_union_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteUnionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteUnionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteUnionHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteUnionHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteUnionHeader& header() + FASTDDS_EXPORTED_API inline CompleteUnionHeader& header() { return m_header; } - RTPS_DllAPI inline void discriminator( + FASTDDS_EXPORTED_API inline void discriminator( const CompleteDiscriminatorMember& _discriminator) { m_discriminator = _discriminator; } - RTPS_DllAPI inline void discriminator( + FASTDDS_EXPORTED_API inline void discriminator( CompleteDiscriminatorMember&& _discriminator) { m_discriminator = std::move(_discriminator); } - RTPS_DllAPI inline const CompleteDiscriminatorMember& discriminator() const + FASTDDS_EXPORTED_API inline const CompleteDiscriminatorMember& discriminator() const { return m_discriminator; } - RTPS_DllAPI inline CompleteDiscriminatorMember& discriminator() + FASTDDS_EXPORTED_API inline CompleteDiscriminatorMember& discriminator() { return m_discriminator; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const CompleteUnionMemberSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( CompleteUnionMemberSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const CompleteUnionMemberSeq& member_seq() const + FASTDDS_EXPORTED_API inline const CompleteUnionMemberSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline CompleteUnionMemberSeq& member_seq() + FASTDDS_EXPORTED_API inline CompleteUnionMemberSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteUnionType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteUnionType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1742,109 +1742,109 @@ class MinimalUnionType { public: - RTPS_DllAPI MinimalUnionType(); - RTPS_DllAPI ~MinimalUnionType(); - RTPS_DllAPI MinimalUnionType( + FASTDDS_EXPORTED_API MinimalUnionType(); + FASTDDS_EXPORTED_API ~MinimalUnionType(); + FASTDDS_EXPORTED_API MinimalUnionType( const MinimalUnionType& x); - RTPS_DllAPI MinimalUnionType( + FASTDDS_EXPORTED_API MinimalUnionType( MinimalUnionType&& x); - RTPS_DllAPI MinimalUnionType& operator =( + FASTDDS_EXPORTED_API MinimalUnionType& operator =( const MinimalUnionType& x); - RTPS_DllAPI MinimalUnionType& operator =( + FASTDDS_EXPORTED_API MinimalUnionType& operator =( MinimalUnionType&& x); - RTPS_DllAPI inline void union_flags( + FASTDDS_EXPORTED_API inline void union_flags( const UnionTypeFlag& _union_flags) { m_union_flags = _union_flags; } - RTPS_DllAPI inline void union_flags( + FASTDDS_EXPORTED_API inline void union_flags( UnionTypeFlag&& _union_flags) { m_union_flags = std::move(_union_flags); } - RTPS_DllAPI inline const UnionTypeFlag& union_flags() const + FASTDDS_EXPORTED_API inline const UnionTypeFlag& union_flags() const { return m_union_flags; } - RTPS_DllAPI inline UnionTypeFlag& union_flags() + FASTDDS_EXPORTED_API inline UnionTypeFlag& union_flags() { return m_union_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalUnionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalUnionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalUnionHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalUnionHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalUnionHeader& header() + FASTDDS_EXPORTED_API inline MinimalUnionHeader& header() { return m_header; } - RTPS_DllAPI inline void discriminator( + FASTDDS_EXPORTED_API inline void discriminator( const MinimalDiscriminatorMember& _discriminator) { m_discriminator = _discriminator; } - RTPS_DllAPI inline void discriminator( + FASTDDS_EXPORTED_API inline void discriminator( MinimalDiscriminatorMember&& _discriminator) { m_discriminator = std::move(_discriminator); } - RTPS_DllAPI inline const MinimalDiscriminatorMember& discriminator() const + FASTDDS_EXPORTED_API inline const MinimalDiscriminatorMember& discriminator() const { return m_discriminator; } - RTPS_DllAPI inline MinimalDiscriminatorMember& discriminator() + FASTDDS_EXPORTED_API inline MinimalDiscriminatorMember& discriminator() { return m_discriminator; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const MinimalUnionMemberSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( MinimalUnionMemberSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const MinimalUnionMemberSeq& member_seq() const + FASTDDS_EXPORTED_API inline const MinimalUnionMemberSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline MinimalUnionMemberSeq& member_seq() + FASTDDS_EXPORTED_API inline MinimalUnionMemberSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalUnionType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalUnionType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1865,65 +1865,65 @@ class CommonAnnotationParameter { public: - RTPS_DllAPI CommonAnnotationParameter(); - RTPS_DllAPI ~CommonAnnotationParameter(); - RTPS_DllAPI CommonAnnotationParameter( + FASTDDS_EXPORTED_API CommonAnnotationParameter(); + FASTDDS_EXPORTED_API ~CommonAnnotationParameter(); + FASTDDS_EXPORTED_API CommonAnnotationParameter( const CommonAnnotationParameter& x); - RTPS_DllAPI CommonAnnotationParameter( + FASTDDS_EXPORTED_API CommonAnnotationParameter( CommonAnnotationParameter&& x); - RTPS_DllAPI CommonAnnotationParameter& operator =( + FASTDDS_EXPORTED_API CommonAnnotationParameter& operator =( const CommonAnnotationParameter& x); - RTPS_DllAPI CommonAnnotationParameter& operator =( + FASTDDS_EXPORTED_API CommonAnnotationParameter& operator =( CommonAnnotationParameter&& x); - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( const AnnotationParameterFlag& _member_flags) { m_member_flags = _member_flags; } - RTPS_DllAPI inline void member_flags( + FASTDDS_EXPORTED_API inline void member_flags( AnnotationParameterFlag&& _member_flags) { m_member_flags = std::move(_member_flags); } - RTPS_DllAPI inline const AnnotationParameterFlag& member_flags() const + FASTDDS_EXPORTED_API inline const AnnotationParameterFlag& member_flags() const { return m_member_flags; } - RTPS_DllAPI inline AnnotationParameterFlag& member_flags() + FASTDDS_EXPORTED_API inline AnnotationParameterFlag& member_flags() { return m_member_flags; } - RTPS_DllAPI inline void member_type_id( + FASTDDS_EXPORTED_API inline void member_type_id( const TypeIdentifier& _member_type_id) { m_member_type_id = _member_type_id; } - RTPS_DllAPI inline void member_type_id( + FASTDDS_EXPORTED_API inline void member_type_id( TypeIdentifier&& _member_type_id) { m_member_type_id = std::move(_member_type_id); } - RTPS_DllAPI inline const TypeIdentifier& member_type_id() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& member_type_id() const { return m_member_type_id; } - RTPS_DllAPI inline TypeIdentifier& member_type_id() + FASTDDS_EXPORTED_API inline TypeIdentifier& member_type_id() { return m_member_type_id; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonAnnotationParameter& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonAnnotationParameter& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -1944,87 +1944,87 @@ class CompleteAnnotationParameter { public: - RTPS_DllAPI CompleteAnnotationParameter(); - RTPS_DllAPI ~CompleteAnnotationParameter(); - RTPS_DllAPI CompleteAnnotationParameter( + FASTDDS_EXPORTED_API CompleteAnnotationParameter(); + FASTDDS_EXPORTED_API ~CompleteAnnotationParameter(); + FASTDDS_EXPORTED_API CompleteAnnotationParameter( const CompleteAnnotationParameter& x); - RTPS_DllAPI CompleteAnnotationParameter( + FASTDDS_EXPORTED_API CompleteAnnotationParameter( CompleteAnnotationParameter&& x); - RTPS_DllAPI CompleteAnnotationParameter& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationParameter& operator =( const CompleteAnnotationParameter& x); - RTPS_DllAPI CompleteAnnotationParameter& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationParameter& operator =( CompleteAnnotationParameter&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonAnnotationParameter& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonAnnotationParameter&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonAnnotationParameter& common() const + FASTDDS_EXPORTED_API inline const CommonAnnotationParameter& common() const { return m_common; } - RTPS_DllAPI inline CommonAnnotationParameter& common() + FASTDDS_EXPORTED_API inline CommonAnnotationParameter& common() { return m_common; } - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( const MemberName& _name) { m_name = _name; } - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( MemberName&& _name) { m_name = std::move(_name); } - RTPS_DllAPI inline const MemberName& name() const + FASTDDS_EXPORTED_API inline const MemberName& name() const { return m_name; } - RTPS_DllAPI inline MemberName& name() + FASTDDS_EXPORTED_API inline MemberName& name() { return m_name; } - RTPS_DllAPI inline void default_value( + FASTDDS_EXPORTED_API inline void default_value( const AnnotationParameterValue& _default_value) { m_default_value = _default_value; } - RTPS_DllAPI inline void default_value( + FASTDDS_EXPORTED_API inline void default_value( AnnotationParameterValue&& _default_value) { m_default_value = std::move(_default_value); } - RTPS_DllAPI inline const AnnotationParameterValue& default_value() const + FASTDDS_EXPORTED_API inline const AnnotationParameterValue& default_value() const { return m_default_value; } - RTPS_DllAPI inline AnnotationParameterValue& default_value() + FASTDDS_EXPORTED_API inline AnnotationParameterValue& default_value() { return m_default_value; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAnnotationParameter& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteAnnotationParameter& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2045,87 +2045,87 @@ class MinimalAnnotationParameter { public: - RTPS_DllAPI MinimalAnnotationParameter(); - RTPS_DllAPI ~MinimalAnnotationParameter(); - RTPS_DllAPI MinimalAnnotationParameter( + FASTDDS_EXPORTED_API MinimalAnnotationParameter(); + FASTDDS_EXPORTED_API ~MinimalAnnotationParameter(); + FASTDDS_EXPORTED_API MinimalAnnotationParameter( const MinimalAnnotationParameter& x); - RTPS_DllAPI MinimalAnnotationParameter( + FASTDDS_EXPORTED_API MinimalAnnotationParameter( MinimalAnnotationParameter&& x); - RTPS_DllAPI MinimalAnnotationParameter& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationParameter& operator =( const MinimalAnnotationParameter& x); - RTPS_DllAPI MinimalAnnotationParameter& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationParameter& operator =( MinimalAnnotationParameter&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonAnnotationParameter& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonAnnotationParameter&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonAnnotationParameter& common() const + FASTDDS_EXPORTED_API inline const CommonAnnotationParameter& common() const { return m_common; } - RTPS_DllAPI inline CommonAnnotationParameter& common() + FASTDDS_EXPORTED_API inline CommonAnnotationParameter& common() { return m_common; } - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( const MemberName& _name) { m_name = _name; } - RTPS_DllAPI inline void name( + FASTDDS_EXPORTED_API inline void name( MemberName&& _name) { m_name = std::move(_name); } - RTPS_DllAPI inline const MemberName& name() const + FASTDDS_EXPORTED_API inline const MemberName& name() const { return m_name; } - RTPS_DllAPI inline MemberName& name() + FASTDDS_EXPORTED_API inline MemberName& name() { return m_name; } - RTPS_DllAPI inline void default_value( + FASTDDS_EXPORTED_API inline void default_value( const AnnotationParameterValue& _default_value) { m_default_value = _default_value; } - RTPS_DllAPI inline void default_value( + FASTDDS_EXPORTED_API inline void default_value( AnnotationParameterValue&& _default_value) { m_default_value = std::move(_default_value); } - RTPS_DllAPI inline const AnnotationParameterValue& default_value() const + FASTDDS_EXPORTED_API inline const AnnotationParameterValue& default_value() const { return m_default_value; } - RTPS_DllAPI inline AnnotationParameterValue& default_value() + FASTDDS_EXPORTED_API inline AnnotationParameterValue& default_value() { return m_default_value; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAnnotationParameter& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalAnnotationParameter& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2145,43 +2145,43 @@ class CompleteAnnotationHeader { public: - RTPS_DllAPI CompleteAnnotationHeader(); - RTPS_DllAPI ~CompleteAnnotationHeader(); - RTPS_DllAPI CompleteAnnotationHeader( + FASTDDS_EXPORTED_API CompleteAnnotationHeader(); + FASTDDS_EXPORTED_API ~CompleteAnnotationHeader(); + FASTDDS_EXPORTED_API CompleteAnnotationHeader( const CompleteAnnotationHeader& x); - RTPS_DllAPI CompleteAnnotationHeader( + FASTDDS_EXPORTED_API CompleteAnnotationHeader( CompleteAnnotationHeader&& x); - RTPS_DllAPI CompleteAnnotationHeader& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationHeader& operator =( const CompleteAnnotationHeader& x); - RTPS_DllAPI CompleteAnnotationHeader& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationHeader& operator =( CompleteAnnotationHeader&& x); - RTPS_DllAPI inline void annotation_name( + FASTDDS_EXPORTED_API inline void annotation_name( const QualifiedTypeName& _annotation_name) { m_annotation_name = _annotation_name; } - RTPS_DllAPI inline void annotation_name( + FASTDDS_EXPORTED_API inline void annotation_name( QualifiedTypeName&& _annotation_name) { m_annotation_name = std::move(_annotation_name); } - RTPS_DllAPI inline const QualifiedTypeName& annotation_name() const + FASTDDS_EXPORTED_API inline const QualifiedTypeName& annotation_name() const { return m_annotation_name; } - RTPS_DllAPI inline QualifiedTypeName& annotation_name() + FASTDDS_EXPORTED_API inline QualifiedTypeName& annotation_name() { return m_annotation_name; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAnnotationHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteAnnotationHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2197,24 +2197,24 @@ class MinimalAnnotationHeader { public: - RTPS_DllAPI MinimalAnnotationHeader(); - RTPS_DllAPI ~MinimalAnnotationHeader(); - RTPS_DllAPI MinimalAnnotationHeader( + FASTDDS_EXPORTED_API MinimalAnnotationHeader(); + FASTDDS_EXPORTED_API ~MinimalAnnotationHeader(); + FASTDDS_EXPORTED_API MinimalAnnotationHeader( const MinimalAnnotationHeader& x); - RTPS_DllAPI MinimalAnnotationHeader( + FASTDDS_EXPORTED_API MinimalAnnotationHeader( MinimalAnnotationHeader&& x); - RTPS_DllAPI MinimalAnnotationHeader& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationHeader& operator =( const MinimalAnnotationHeader& x); - RTPS_DllAPI MinimalAnnotationHeader& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationHeader& operator =( MinimalAnnotationHeader&& x); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAnnotationHeader&) const { return true; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalAnnotationHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2231,87 +2231,87 @@ class CompleteAnnotationType final { public: - RTPS_DllAPI CompleteAnnotationType(); - RTPS_DllAPI ~CompleteAnnotationType(); - RTPS_DllAPI CompleteAnnotationType( + FASTDDS_EXPORTED_API CompleteAnnotationType(); + FASTDDS_EXPORTED_API ~CompleteAnnotationType(); + FASTDDS_EXPORTED_API CompleteAnnotationType( const CompleteAnnotationType& x); - RTPS_DllAPI CompleteAnnotationType( + FASTDDS_EXPORTED_API CompleteAnnotationType( CompleteAnnotationType&& x); - RTPS_DllAPI CompleteAnnotationType& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationType& operator =( const CompleteAnnotationType& x); - RTPS_DllAPI CompleteAnnotationType& operator =( + FASTDDS_EXPORTED_API CompleteAnnotationType& operator =( CompleteAnnotationType&& x); - RTPS_DllAPI inline void annotation_flag( + FASTDDS_EXPORTED_API inline void annotation_flag( const AnnotationTypeFlag& _annotation_flag) { m_annotation_flag = _annotation_flag; } - RTPS_DllAPI inline void annotation_flag( + FASTDDS_EXPORTED_API inline void annotation_flag( AnnotationTypeFlag&& _annotation_flag) { m_annotation_flag = std::move(_annotation_flag); } - RTPS_DllAPI inline const AnnotationTypeFlag& annotation_flag() const + FASTDDS_EXPORTED_API inline const AnnotationTypeFlag& annotation_flag() const { return m_annotation_flag; } - RTPS_DllAPI inline AnnotationTypeFlag& annotation_flag() + FASTDDS_EXPORTED_API inline AnnotationTypeFlag& annotation_flag() { return m_annotation_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteAnnotationHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteAnnotationHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteAnnotationHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteAnnotationHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteAnnotationHeader& header() + FASTDDS_EXPORTED_API inline CompleteAnnotationHeader& header() { return m_header; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const CompleteAnnotationParameterSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( CompleteAnnotationParameterSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const CompleteAnnotationParameterSeq& member_seq() const + FASTDDS_EXPORTED_API inline const CompleteAnnotationParameterSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline CompleteAnnotationParameterSeq& member_seq() + FASTDDS_EXPORTED_API inline CompleteAnnotationParameterSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAnnotationType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteAnnotationType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2330,87 +2330,87 @@ class MinimalAnnotationType final { public: - RTPS_DllAPI MinimalAnnotationType(); - RTPS_DllAPI ~MinimalAnnotationType(); - RTPS_DllAPI MinimalAnnotationType( + FASTDDS_EXPORTED_API MinimalAnnotationType(); + FASTDDS_EXPORTED_API ~MinimalAnnotationType(); + FASTDDS_EXPORTED_API MinimalAnnotationType( const MinimalAnnotationType& x); - RTPS_DllAPI MinimalAnnotationType( + FASTDDS_EXPORTED_API MinimalAnnotationType( MinimalAnnotationType&& x); - RTPS_DllAPI MinimalAnnotationType& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationType& operator =( const MinimalAnnotationType& x); - RTPS_DllAPI MinimalAnnotationType& operator =( + FASTDDS_EXPORTED_API MinimalAnnotationType& operator =( MinimalAnnotationType&& x); - RTPS_DllAPI inline void annotation_flag( + FASTDDS_EXPORTED_API inline void annotation_flag( const AnnotationTypeFlag& _annotation_flag) { m_annotation_flag = _annotation_flag; } - RTPS_DllAPI inline void annotation_flag( + FASTDDS_EXPORTED_API inline void annotation_flag( AnnotationTypeFlag&& _annotation_flag) { m_annotation_flag = std::move(_annotation_flag); } - RTPS_DllAPI inline const AnnotationTypeFlag& annotation_flag() const + FASTDDS_EXPORTED_API inline const AnnotationTypeFlag& annotation_flag() const { return m_annotation_flag; } - RTPS_DllAPI inline AnnotationTypeFlag& annotation_flag() + FASTDDS_EXPORTED_API inline AnnotationTypeFlag& annotation_flag() { return m_annotation_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalAnnotationHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalAnnotationHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalAnnotationHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalAnnotationHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalAnnotationHeader& header() + FASTDDS_EXPORTED_API inline MinimalAnnotationHeader& header() { return m_header; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( const MinimalAnnotationParameterSeq& _member_seq) { m_member_seq = _member_seq; } - RTPS_DllAPI inline void member_seq( + FASTDDS_EXPORTED_API inline void member_seq( MinimalAnnotationParameterSeq&& _member_seq) { m_member_seq = std::move(_member_seq); } - RTPS_DllAPI inline const MinimalAnnotationParameterSeq& member_seq() const + FASTDDS_EXPORTED_API inline const MinimalAnnotationParameterSeq& member_seq() const { return m_member_seq; } - RTPS_DllAPI inline MinimalAnnotationParameterSeq& member_seq() + FASTDDS_EXPORTED_API inline MinimalAnnotationParameterSeq& member_seq() { return m_member_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAnnotationType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalAnnotationType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -2430,65 +2430,65 @@ class CommonAliasBody { public: - RTPS_DllAPI CommonAliasBody(); - RTPS_DllAPI ~CommonAliasBody(); - RTPS_DllAPI CommonAliasBody( + FASTDDS_EXPORTED_API CommonAliasBody(); + FASTDDS_EXPORTED_API ~CommonAliasBody(); + FASTDDS_EXPORTED_API CommonAliasBody( const CommonAliasBody& x); - RTPS_DllAPI CommonAliasBody( + FASTDDS_EXPORTED_API CommonAliasBody( CommonAliasBody&& x); - RTPS_DllAPI CommonAliasBody& operator =( + FASTDDS_EXPORTED_API CommonAliasBody& operator =( const CommonAliasBody& x); - RTPS_DllAPI CommonAliasBody& operator =( + FASTDDS_EXPORTED_API CommonAliasBody& operator =( CommonAliasBody&& x); - RTPS_DllAPI inline void related_flags( + FASTDDS_EXPORTED_API inline void related_flags( const AliasMemberFlag& _related_flags) { m_related_flags = _related_flags; } - RTPS_DllAPI inline void related_flags( + FASTDDS_EXPORTED_API inline void related_flags( AliasMemberFlag&& _related_flags) { m_related_flags = std::move(_related_flags); } - RTPS_DllAPI inline const AliasMemberFlag& related_flags() const + FASTDDS_EXPORTED_API inline const AliasMemberFlag& related_flags() const { return m_related_flags; } - RTPS_DllAPI inline AliasMemberFlag& related_flags() + FASTDDS_EXPORTED_API inline AliasMemberFlag& related_flags() { return m_related_flags; } - RTPS_DllAPI inline void related_type( + FASTDDS_EXPORTED_API inline void related_type( const TypeIdentifier& _related_type) { m_related_type = _related_type; } - RTPS_DllAPI inline void related_type( + FASTDDS_EXPORTED_API inline void related_type( TypeIdentifier&& _related_type) { m_related_type = std::move(_related_type); } - RTPS_DllAPI inline const TypeIdentifier& related_type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& related_type() const { return m_related_type; } - RTPS_DllAPI inline TypeIdentifier& related_type() + FASTDDS_EXPORTED_API inline TypeIdentifier& related_type() { return m_related_type; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonAliasBody& other) const; - // RTPS_DllAPI bool consistent(const CommonAliasBody &x, + // FASTDDS_EXPORTED_API bool consistent(const CommonAliasBody &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2506,87 +2506,87 @@ class CompleteAliasBody { public: - RTPS_DllAPI CompleteAliasBody(); - RTPS_DllAPI ~CompleteAliasBody(); - RTPS_DllAPI CompleteAliasBody( + FASTDDS_EXPORTED_API CompleteAliasBody(); + FASTDDS_EXPORTED_API ~CompleteAliasBody(); + FASTDDS_EXPORTED_API CompleteAliasBody( const CompleteAliasBody& x); - RTPS_DllAPI CompleteAliasBody( + FASTDDS_EXPORTED_API CompleteAliasBody( CompleteAliasBody&& x); - RTPS_DllAPI CompleteAliasBody& operator =( + FASTDDS_EXPORTED_API CompleteAliasBody& operator =( const CompleteAliasBody& x); - RTPS_DllAPI CompleteAliasBody& operator =( + FASTDDS_EXPORTED_API CompleteAliasBody& operator =( CompleteAliasBody&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonAliasBody& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonAliasBody&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonAliasBody& common() const + FASTDDS_EXPORTED_API inline const CommonAliasBody& common() const { return m_common; } - RTPS_DllAPI inline CommonAliasBody& common() + FASTDDS_EXPORTED_API inline CommonAliasBody& common() { return m_common; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( const AppliedBuiltinMemberAnnotations& _ann_builtin) { m_ann_builtin = _ann_builtin; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( AppliedBuiltinMemberAnnotations&& _ann_builtin) { m_ann_builtin = std::move(_ann_builtin); } - RTPS_DllAPI inline const AppliedBuiltinMemberAnnotations& ann_builtin() const + FASTDDS_EXPORTED_API inline const AppliedBuiltinMemberAnnotations& ann_builtin() const { return m_ann_builtin; } - RTPS_DllAPI inline AppliedBuiltinMemberAnnotations& ann_builtin() + FASTDDS_EXPORTED_API inline AppliedBuiltinMemberAnnotations& ann_builtin() { return m_ann_builtin; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( const AppliedAnnotationSeq& _ann_custom) { m_ann_custom = _ann_custom; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( AppliedAnnotationSeq&& _ann_custom) { m_ann_custom = std::move(_ann_custom); } - RTPS_DllAPI inline const AppliedAnnotationSeq& ann_custom() const + FASTDDS_EXPORTED_API inline const AppliedAnnotationSeq& ann_custom() const { return m_ann_custom; } - RTPS_DllAPI inline AppliedAnnotationSeq& ann_custom() + FASTDDS_EXPORTED_API inline AppliedAnnotationSeq& ann_custom() { return m_ann_custom; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAliasBody& other) const; - // RTPS_DllAPI bool consistent(const CompleteAliasBody &x, + // FASTDDS_EXPORTED_API bool consistent(const CompleteAliasBody &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2603,43 +2603,43 @@ class MinimalAliasBody { public: - RTPS_DllAPI MinimalAliasBody(); - RTPS_DllAPI ~MinimalAliasBody(); - RTPS_DllAPI MinimalAliasBody( + FASTDDS_EXPORTED_API MinimalAliasBody(); + FASTDDS_EXPORTED_API ~MinimalAliasBody(); + FASTDDS_EXPORTED_API MinimalAliasBody( const MinimalAliasBody& x); - RTPS_DllAPI MinimalAliasBody( + FASTDDS_EXPORTED_API MinimalAliasBody( MinimalAliasBody&& x); - RTPS_DllAPI MinimalAliasBody& operator =( + FASTDDS_EXPORTED_API MinimalAliasBody& operator =( const MinimalAliasBody& x); - RTPS_DllAPI MinimalAliasBody& operator =( + FASTDDS_EXPORTED_API MinimalAliasBody& operator =( MinimalAliasBody&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonAliasBody& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonAliasBody&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonAliasBody& common() const + FASTDDS_EXPORTED_API inline const CommonAliasBody& common() const { return m_common; } - RTPS_DllAPI inline CommonAliasBody& common() + FASTDDS_EXPORTED_API inline CommonAliasBody& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAliasBody& other) const; - // RTPS_DllAPI bool consistent(const MinimalAliasBody &x, + // FASTDDS_EXPORTED_API bool consistent(const MinimalAliasBody &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2654,43 +2654,43 @@ class CompleteAliasHeader { public: - RTPS_DllAPI CompleteAliasHeader(); - RTPS_DllAPI ~CompleteAliasHeader(); - RTPS_DllAPI CompleteAliasHeader( + FASTDDS_EXPORTED_API CompleteAliasHeader(); + FASTDDS_EXPORTED_API ~CompleteAliasHeader(); + FASTDDS_EXPORTED_API CompleteAliasHeader( const CompleteAliasHeader& x); - RTPS_DllAPI CompleteAliasHeader( + FASTDDS_EXPORTED_API CompleteAliasHeader( CompleteAliasHeader&& x); - RTPS_DllAPI CompleteAliasHeader& operator =( + FASTDDS_EXPORTED_API CompleteAliasHeader& operator =( const CompleteAliasHeader& x); - RTPS_DllAPI CompleteAliasHeader& operator =( + FASTDDS_EXPORTED_API CompleteAliasHeader& operator =( CompleteAliasHeader&& x); - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAliasHeader& other) const; - // RTPS_DllAPI bool consistent(const CompleteAliasHeader &x, + // FASTDDS_EXPORTED_API bool consistent(const CompleteAliasHeader &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2705,24 +2705,24 @@ class MinimalAliasHeader { public: - RTPS_DllAPI MinimalAliasHeader(); - RTPS_DllAPI ~MinimalAliasHeader(); - RTPS_DllAPI MinimalAliasHeader( + FASTDDS_EXPORTED_API MinimalAliasHeader(); + FASTDDS_EXPORTED_API ~MinimalAliasHeader(); + FASTDDS_EXPORTED_API MinimalAliasHeader( const MinimalAliasHeader& x); - RTPS_DllAPI MinimalAliasHeader( + FASTDDS_EXPORTED_API MinimalAliasHeader( MinimalAliasHeader&& x); - RTPS_DllAPI MinimalAliasHeader& operator =( + FASTDDS_EXPORTED_API MinimalAliasHeader& operator =( const MinimalAliasHeader& x); - RTPS_DllAPI MinimalAliasHeader& operator =( + FASTDDS_EXPORTED_API MinimalAliasHeader& operator =( MinimalAliasHeader&& x); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAliasHeader&) const { return true; } - // RTPS_DllAPI bool consistent(const MinimalAliasHeader &x, + // FASTDDS_EXPORTED_API bool consistent(const MinimalAliasHeader &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2738,87 +2738,87 @@ class CompleteAliasType { public: - RTPS_DllAPI CompleteAliasType(); - RTPS_DllAPI ~CompleteAliasType(); - RTPS_DllAPI CompleteAliasType( + FASTDDS_EXPORTED_API CompleteAliasType(); + FASTDDS_EXPORTED_API ~CompleteAliasType(); + FASTDDS_EXPORTED_API CompleteAliasType( const CompleteAliasType& x); - RTPS_DllAPI CompleteAliasType( + FASTDDS_EXPORTED_API CompleteAliasType( CompleteAliasType&& x); - RTPS_DllAPI CompleteAliasType& operator =( + FASTDDS_EXPORTED_API CompleteAliasType& operator =( const CompleteAliasType& x); - RTPS_DllAPI CompleteAliasType& operator =( + FASTDDS_EXPORTED_API CompleteAliasType& operator =( CompleteAliasType&& x); - RTPS_DllAPI inline void alias_flags( + FASTDDS_EXPORTED_API inline void alias_flags( const AliasTypeFlag& _alias_flags) { m_alias_flags = _alias_flags; } - RTPS_DllAPI inline void alias_flags( + FASTDDS_EXPORTED_API inline void alias_flags( AliasTypeFlag&& _alias_flags) { m_alias_flags = std::move(_alias_flags); } - RTPS_DllAPI inline const AliasTypeFlag& alias_flags() const + FASTDDS_EXPORTED_API inline const AliasTypeFlag& alias_flags() const { return m_alias_flags; } - RTPS_DllAPI inline AliasTypeFlag& alias_flags() + FASTDDS_EXPORTED_API inline AliasTypeFlag& alias_flags() { return m_alias_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteAliasHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteAliasHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteAliasHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteAliasHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteAliasHeader& header() + FASTDDS_EXPORTED_API inline CompleteAliasHeader& header() { return m_header; } - RTPS_DllAPI inline void body( + FASTDDS_EXPORTED_API inline void body( const CompleteAliasBody& _body) { m_body = _body; } - RTPS_DllAPI inline void body( + FASTDDS_EXPORTED_API inline void body( CompleteAliasBody&& _body) { m_body = std::move(_body); } - RTPS_DllAPI inline const CompleteAliasBody& body() const + FASTDDS_EXPORTED_API inline const CompleteAliasBody& body() const { return m_body; } - RTPS_DllAPI inline CompleteAliasBody& body() + FASTDDS_EXPORTED_API inline CompleteAliasBody& body() { return m_body; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteAliasType& other) const; - // RTPS_DllAPI bool consistent(const CompleteAliasType &x, + // FASTDDS_EXPORTED_API bool consistent(const CompleteAliasType &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2836,87 +2836,87 @@ class MinimalAliasType { public: - RTPS_DllAPI MinimalAliasType(); - RTPS_DllAPI ~MinimalAliasType(); - RTPS_DllAPI MinimalAliasType( + FASTDDS_EXPORTED_API MinimalAliasType(); + FASTDDS_EXPORTED_API ~MinimalAliasType(); + FASTDDS_EXPORTED_API MinimalAliasType( const MinimalAliasType& x); - RTPS_DllAPI MinimalAliasType( + FASTDDS_EXPORTED_API MinimalAliasType( MinimalAliasType&& x); - RTPS_DllAPI MinimalAliasType& operator =( + FASTDDS_EXPORTED_API MinimalAliasType& operator =( const MinimalAliasType& x); - RTPS_DllAPI MinimalAliasType& operator =( + FASTDDS_EXPORTED_API MinimalAliasType& operator =( MinimalAliasType&& x); - RTPS_DllAPI inline void alias_flags( + FASTDDS_EXPORTED_API inline void alias_flags( const AliasTypeFlag& _alias_flags) { m_alias_flags = _alias_flags; } - RTPS_DllAPI inline void alias_flags( + FASTDDS_EXPORTED_API inline void alias_flags( AliasTypeFlag&& _alias_flags) { m_alias_flags = std::move(_alias_flags); } - RTPS_DllAPI inline const AliasTypeFlag& alias_flags() const + FASTDDS_EXPORTED_API inline const AliasTypeFlag& alias_flags() const { return m_alias_flags; } - RTPS_DllAPI inline AliasTypeFlag& alias_flags() + FASTDDS_EXPORTED_API inline AliasTypeFlag& alias_flags() { return m_alias_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalAliasHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalAliasHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalAliasHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalAliasHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalAliasHeader& header() + FASTDDS_EXPORTED_API inline MinimalAliasHeader& header() { return m_header; } - RTPS_DllAPI inline void body( + FASTDDS_EXPORTED_API inline void body( const MinimalAliasBody& _body) { m_body = _body; } - RTPS_DllAPI inline void body( + FASTDDS_EXPORTED_API inline void body( MinimalAliasBody&& _body) { m_body = std::move(_body); } - RTPS_DllAPI inline const MinimalAliasBody& body() const + FASTDDS_EXPORTED_API inline const MinimalAliasBody& body() const { return m_body; } - RTPS_DllAPI inline MinimalAliasBody& body() + FASTDDS_EXPORTED_API inline MinimalAliasBody& body() { return m_body; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalAliasType& other) const; - // RTPS_DllAPI bool consistent(const MinimalAliasType &x, + // FASTDDS_EXPORTED_API bool consistent(const MinimalAliasType &x, // const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; private: @@ -2935,65 +2935,65 @@ class CompleteElementDetail { public: - RTPS_DllAPI CompleteElementDetail(); - RTPS_DllAPI ~CompleteElementDetail(); - RTPS_DllAPI CompleteElementDetail( + FASTDDS_EXPORTED_API CompleteElementDetail(); + FASTDDS_EXPORTED_API ~CompleteElementDetail(); + FASTDDS_EXPORTED_API CompleteElementDetail( const CompleteElementDetail& x); - RTPS_DllAPI CompleteElementDetail( + FASTDDS_EXPORTED_API CompleteElementDetail( CompleteElementDetail&& x); - RTPS_DllAPI CompleteElementDetail& operator =( + FASTDDS_EXPORTED_API CompleteElementDetail& operator =( const CompleteElementDetail& x); - RTPS_DllAPI CompleteElementDetail& operator =( + FASTDDS_EXPORTED_API CompleteElementDetail& operator =( CompleteElementDetail&& x); - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( const AppliedBuiltinMemberAnnotations& _ann_builtin) { m_ann_builtin = _ann_builtin; } - RTPS_DllAPI inline void ann_builtin( + FASTDDS_EXPORTED_API inline void ann_builtin( AppliedBuiltinMemberAnnotations&& _ann_builtin) { m_ann_builtin = std::move(_ann_builtin); } - RTPS_DllAPI inline const AppliedBuiltinMemberAnnotations& ann_builtin() const + FASTDDS_EXPORTED_API inline const AppliedBuiltinMemberAnnotations& ann_builtin() const { return m_ann_builtin; } - RTPS_DllAPI inline AppliedBuiltinMemberAnnotations& ann_builtin() + FASTDDS_EXPORTED_API inline AppliedBuiltinMemberAnnotations& ann_builtin() { return m_ann_builtin; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( const AppliedAnnotationSeq& _ann_custom) { m_ann_custom = _ann_custom; } - RTPS_DllAPI inline void ann_custom( + FASTDDS_EXPORTED_API inline void ann_custom( AppliedAnnotationSeq&& _ann_custom) { m_ann_custom = std::move(_ann_custom); } - RTPS_DllAPI inline const AppliedAnnotationSeq& ann_custom() const + FASTDDS_EXPORTED_API inline const AppliedAnnotationSeq& ann_custom() const { return m_ann_custom; } - RTPS_DllAPI inline AppliedAnnotationSeq& ann_custom() + FASTDDS_EXPORTED_API inline AppliedAnnotationSeq& ann_custom() { return m_ann_custom; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteElementDetail& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteElementDetail& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3010,65 +3010,65 @@ class CommonCollectionElement final { public: - RTPS_DllAPI CommonCollectionElement(); - RTPS_DllAPI ~CommonCollectionElement(); - RTPS_DllAPI CommonCollectionElement( + FASTDDS_EXPORTED_API CommonCollectionElement(); + FASTDDS_EXPORTED_API ~CommonCollectionElement(); + FASTDDS_EXPORTED_API CommonCollectionElement( const CommonCollectionElement& x); - RTPS_DllAPI CommonCollectionElement( + FASTDDS_EXPORTED_API CommonCollectionElement( CommonCollectionElement&& x); - RTPS_DllAPI CommonCollectionElement& operator =( + FASTDDS_EXPORTED_API CommonCollectionElement& operator =( const CommonCollectionElement& x); - RTPS_DllAPI CommonCollectionElement& operator =( + FASTDDS_EXPORTED_API CommonCollectionElement& operator =( CommonCollectionElement&& x); - RTPS_DllAPI inline void element_flags( + FASTDDS_EXPORTED_API inline void element_flags( const CollectionElementFlag& _element_flags) { m_element_flags = _element_flags; } - RTPS_DllAPI inline void element_flags( + FASTDDS_EXPORTED_API inline void element_flags( CollectionElementFlag&& _element_flags) { m_element_flags = std::move(_element_flags); } - RTPS_DllAPI inline const CollectionElementFlag& element_flags() const + FASTDDS_EXPORTED_API inline const CollectionElementFlag& element_flags() const { return m_element_flags; } - RTPS_DllAPI inline CollectionElementFlag& element_flags() + FASTDDS_EXPORTED_API inline CollectionElementFlag& element_flags() { return m_element_flags; } - RTPS_DllAPI inline void type( + FASTDDS_EXPORTED_API inline void type( const TypeIdentifier& _type) { m_type = _type; } - RTPS_DllAPI inline void type( + FASTDDS_EXPORTED_API inline void type( TypeIdentifier&& _type) { m_type = std::move(_type); } - RTPS_DllAPI inline const TypeIdentifier& type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type() const { return m_type; } - RTPS_DllAPI inline TypeIdentifier& type() + FASTDDS_EXPORTED_API inline TypeIdentifier& type() { return m_type; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonCollectionElement& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonCollectionElement& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3086,65 +3086,65 @@ class CompleteCollectionElement { public: - RTPS_DllAPI CompleteCollectionElement(); - RTPS_DllAPI ~CompleteCollectionElement(); - RTPS_DllAPI CompleteCollectionElement( + FASTDDS_EXPORTED_API CompleteCollectionElement(); + FASTDDS_EXPORTED_API ~CompleteCollectionElement(); + FASTDDS_EXPORTED_API CompleteCollectionElement( const CompleteCollectionElement& x); - RTPS_DllAPI CompleteCollectionElement( + FASTDDS_EXPORTED_API CompleteCollectionElement( CompleteCollectionElement&& x); - RTPS_DllAPI CompleteCollectionElement& operator =( + FASTDDS_EXPORTED_API CompleteCollectionElement& operator =( const CompleteCollectionElement& x); - RTPS_DllAPI CompleteCollectionElement& operator =( + FASTDDS_EXPORTED_API CompleteCollectionElement& operator =( CompleteCollectionElement&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonCollectionElement& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonCollectionElement&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonCollectionElement& common() const + FASTDDS_EXPORTED_API inline const CommonCollectionElement& common() const { return m_common; } - RTPS_DllAPI inline CommonCollectionElement& common() + FASTDDS_EXPORTED_API inline CommonCollectionElement& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteElementDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteElementDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteElementDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteElementDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteElementDetail& detail() + FASTDDS_EXPORTED_API inline CompleteElementDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteCollectionElement& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteCollectionElement& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3161,43 +3161,43 @@ class MinimalCollectionElement { public: - RTPS_DllAPI MinimalCollectionElement(); - RTPS_DllAPI ~MinimalCollectionElement(); - RTPS_DllAPI MinimalCollectionElement( + FASTDDS_EXPORTED_API MinimalCollectionElement(); + FASTDDS_EXPORTED_API ~MinimalCollectionElement(); + FASTDDS_EXPORTED_API MinimalCollectionElement( const MinimalCollectionElement& x); - RTPS_DllAPI MinimalCollectionElement( + FASTDDS_EXPORTED_API MinimalCollectionElement( MinimalCollectionElement&& x); - RTPS_DllAPI MinimalCollectionElement& operator =( + FASTDDS_EXPORTED_API MinimalCollectionElement& operator =( const MinimalCollectionElement& x); - RTPS_DllAPI MinimalCollectionElement& operator =( + FASTDDS_EXPORTED_API MinimalCollectionElement& operator =( MinimalCollectionElement&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonCollectionElement& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonCollectionElement&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonCollectionElement& common() const + FASTDDS_EXPORTED_API inline const CommonCollectionElement& common() const { return m_common; } - RTPS_DllAPI inline CommonCollectionElement& common() + FASTDDS_EXPORTED_API inline CommonCollectionElement& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalCollectionElement& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalCollectionElement& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3213,43 +3213,43 @@ class CommonCollectionHeader { public: - RTPS_DllAPI CommonCollectionHeader(); - RTPS_DllAPI ~CommonCollectionHeader(); - RTPS_DllAPI CommonCollectionHeader( + FASTDDS_EXPORTED_API CommonCollectionHeader(); + FASTDDS_EXPORTED_API ~CommonCollectionHeader(); + FASTDDS_EXPORTED_API CommonCollectionHeader( const CommonCollectionHeader& x); - RTPS_DllAPI CommonCollectionHeader( + FASTDDS_EXPORTED_API CommonCollectionHeader( CommonCollectionHeader&& x); - RTPS_DllAPI CommonCollectionHeader& operator =( + FASTDDS_EXPORTED_API CommonCollectionHeader& operator =( const CommonCollectionHeader& x); - RTPS_DllAPI CommonCollectionHeader& operator =( + FASTDDS_EXPORTED_API CommonCollectionHeader& operator =( CommonCollectionHeader&& x); - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( const LBound& _bound) { m_bound = _bound; } - RTPS_DllAPI inline void bound( + FASTDDS_EXPORTED_API inline void bound( LBound&& _bound) { m_bound = std::move(_bound); } - RTPS_DllAPI inline const LBound& bound() const + FASTDDS_EXPORTED_API inline const LBound& bound() const { return m_bound; } - RTPS_DllAPI inline LBound& bound() + FASTDDS_EXPORTED_API inline LBound& bound() { return m_bound; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonCollectionHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonCollectionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3266,65 +3266,65 @@ class CompleteCollectionHeader { public: - RTPS_DllAPI CompleteCollectionHeader(); - RTPS_DllAPI ~CompleteCollectionHeader(); - RTPS_DllAPI CompleteCollectionHeader( + FASTDDS_EXPORTED_API CompleteCollectionHeader(); + FASTDDS_EXPORTED_API ~CompleteCollectionHeader(); + FASTDDS_EXPORTED_API CompleteCollectionHeader( const CompleteCollectionHeader& x); - RTPS_DllAPI CompleteCollectionHeader( + FASTDDS_EXPORTED_API CompleteCollectionHeader( CompleteCollectionHeader&& x); - RTPS_DllAPI CompleteCollectionHeader& operator =( + FASTDDS_EXPORTED_API CompleteCollectionHeader& operator =( const CompleteCollectionHeader& x); - RTPS_DllAPI CompleteCollectionHeader& operator =( + FASTDDS_EXPORTED_API CompleteCollectionHeader& operator =( CompleteCollectionHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonCollectionHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonCollectionHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonCollectionHeader& common() const + FASTDDS_EXPORTED_API inline const CommonCollectionHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonCollectionHeader& common() + FASTDDS_EXPORTED_API inline CommonCollectionHeader& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteCollectionHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteCollectionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3341,43 +3341,43 @@ class MinimalCollectionHeader { public: - RTPS_DllAPI MinimalCollectionHeader(); - RTPS_DllAPI ~MinimalCollectionHeader(); - RTPS_DllAPI MinimalCollectionHeader( + FASTDDS_EXPORTED_API MinimalCollectionHeader(); + FASTDDS_EXPORTED_API ~MinimalCollectionHeader(); + FASTDDS_EXPORTED_API MinimalCollectionHeader( const MinimalCollectionHeader& x); - RTPS_DllAPI MinimalCollectionHeader( + FASTDDS_EXPORTED_API MinimalCollectionHeader( MinimalCollectionHeader&& x); - RTPS_DllAPI MinimalCollectionHeader& operator =( + FASTDDS_EXPORTED_API MinimalCollectionHeader& operator =( const MinimalCollectionHeader& x); - RTPS_DllAPI MinimalCollectionHeader& operator =( + FASTDDS_EXPORTED_API MinimalCollectionHeader& operator =( MinimalCollectionHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonCollectionHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonCollectionHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonCollectionHeader& common() const + FASTDDS_EXPORTED_API inline const CommonCollectionHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonCollectionHeader& common() + FASTDDS_EXPORTED_API inline CommonCollectionHeader& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalCollectionHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalCollectionHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3396,87 +3396,87 @@ class CompleteSequenceType { public: - RTPS_DllAPI CompleteSequenceType(); - RTPS_DllAPI ~CompleteSequenceType(); - RTPS_DllAPI CompleteSequenceType( + FASTDDS_EXPORTED_API CompleteSequenceType(); + FASTDDS_EXPORTED_API ~CompleteSequenceType(); + FASTDDS_EXPORTED_API CompleteSequenceType( const CompleteSequenceType& x); - RTPS_DllAPI CompleteSequenceType( + FASTDDS_EXPORTED_API CompleteSequenceType( CompleteSequenceType&& x); - RTPS_DllAPI CompleteSequenceType& operator =( + FASTDDS_EXPORTED_API CompleteSequenceType& operator =( const CompleteSequenceType& x); - RTPS_DllAPI CompleteSequenceType& operator =( + FASTDDS_EXPORTED_API CompleteSequenceType& operator =( CompleteSequenceType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteCollectionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteCollectionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteCollectionHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteCollectionHeader& header() + FASTDDS_EXPORTED_API inline CompleteCollectionHeader& header() { return m_header; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const CompleteCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( CompleteCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const CompleteCollectionElement& element() const + FASTDDS_EXPORTED_API inline const CompleteCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline CompleteCollectionElement& element() + FASTDDS_EXPORTED_API inline CompleteCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteSequenceType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteSequenceType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3496,87 +3496,87 @@ class MinimalSequenceType { public: - RTPS_DllAPI MinimalSequenceType(); - RTPS_DllAPI ~MinimalSequenceType(); - RTPS_DllAPI MinimalSequenceType( + FASTDDS_EXPORTED_API MinimalSequenceType(); + FASTDDS_EXPORTED_API ~MinimalSequenceType(); + FASTDDS_EXPORTED_API MinimalSequenceType( const MinimalSequenceType& x); - RTPS_DllAPI MinimalSequenceType( + FASTDDS_EXPORTED_API MinimalSequenceType( MinimalSequenceType&& x); - RTPS_DllAPI MinimalSequenceType& operator =( + FASTDDS_EXPORTED_API MinimalSequenceType& operator =( const MinimalSequenceType& x); - RTPS_DllAPI MinimalSequenceType& operator =( + FASTDDS_EXPORTED_API MinimalSequenceType& operator =( MinimalSequenceType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalCollectionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalCollectionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalCollectionHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalCollectionHeader& header() + FASTDDS_EXPORTED_API inline MinimalCollectionHeader& header() { return m_header; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const MinimalCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( MinimalCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const MinimalCollectionElement& element() const + FASTDDS_EXPORTED_API inline const MinimalCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline MinimalCollectionElement& element() + FASTDDS_EXPORTED_API inline MinimalCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalSequenceType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalSequenceType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3595,43 +3595,43 @@ class CommonArrayHeader { public: - RTPS_DllAPI CommonArrayHeader(); - RTPS_DllAPI ~CommonArrayHeader(); - RTPS_DllAPI CommonArrayHeader( + FASTDDS_EXPORTED_API CommonArrayHeader(); + FASTDDS_EXPORTED_API ~CommonArrayHeader(); + FASTDDS_EXPORTED_API CommonArrayHeader( const CommonArrayHeader& x); - RTPS_DllAPI CommonArrayHeader( + FASTDDS_EXPORTED_API CommonArrayHeader( CommonArrayHeader&& x); - RTPS_DllAPI CommonArrayHeader& operator =( + FASTDDS_EXPORTED_API CommonArrayHeader& operator =( const CommonArrayHeader& x); - RTPS_DllAPI CommonArrayHeader& operator =( + FASTDDS_EXPORTED_API CommonArrayHeader& operator =( CommonArrayHeader&& x); - RTPS_DllAPI inline void bound_seq( + FASTDDS_EXPORTED_API inline void bound_seq( const LBoundSeq& _bound_seq) { m_bound_seq = _bound_seq; } - RTPS_DllAPI inline void bound_seq( + FASTDDS_EXPORTED_API inline void bound_seq( LBoundSeq&& _bound_seq) { m_bound_seq = std::move(_bound_seq); } - RTPS_DllAPI inline const LBoundSeq& bound_seq() const + FASTDDS_EXPORTED_API inline const LBoundSeq& bound_seq() const { return m_bound_seq; } - RTPS_DllAPI inline LBoundSeq& bound_seq() + FASTDDS_EXPORTED_API inline LBoundSeq& bound_seq() { return m_bound_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonArrayHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonArrayHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3648,65 +3648,65 @@ class CompleteArrayHeader { public: - RTPS_DllAPI CompleteArrayHeader(); - RTPS_DllAPI ~CompleteArrayHeader(); - RTPS_DllAPI CompleteArrayHeader( + FASTDDS_EXPORTED_API CompleteArrayHeader(); + FASTDDS_EXPORTED_API ~CompleteArrayHeader(); + FASTDDS_EXPORTED_API CompleteArrayHeader( const CompleteArrayHeader& x); - RTPS_DllAPI CompleteArrayHeader( + FASTDDS_EXPORTED_API CompleteArrayHeader( CompleteArrayHeader&& x); - RTPS_DllAPI CompleteArrayHeader& operator =( + FASTDDS_EXPORTED_API CompleteArrayHeader& operator =( const CompleteArrayHeader& x); - RTPS_DllAPI CompleteArrayHeader& operator =( + FASTDDS_EXPORTED_API CompleteArrayHeader& operator =( CompleteArrayHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonArrayHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonArrayHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonArrayHeader& common() const + FASTDDS_EXPORTED_API inline const CommonArrayHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonArrayHeader& common() + FASTDDS_EXPORTED_API inline CommonArrayHeader& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteArrayHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteArrayHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3723,43 +3723,43 @@ class MinimalArrayHeader { public: - RTPS_DllAPI MinimalArrayHeader(); - RTPS_DllAPI ~MinimalArrayHeader(); - RTPS_DllAPI MinimalArrayHeader( + FASTDDS_EXPORTED_API MinimalArrayHeader(); + FASTDDS_EXPORTED_API ~MinimalArrayHeader(); + FASTDDS_EXPORTED_API MinimalArrayHeader( const MinimalArrayHeader& x); - RTPS_DllAPI MinimalArrayHeader( + FASTDDS_EXPORTED_API MinimalArrayHeader( MinimalArrayHeader&& x); - RTPS_DllAPI MinimalArrayHeader& operator =( + FASTDDS_EXPORTED_API MinimalArrayHeader& operator =( const MinimalArrayHeader& x); - RTPS_DllAPI MinimalArrayHeader& operator =( + FASTDDS_EXPORTED_API MinimalArrayHeader& operator =( MinimalArrayHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonArrayHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonArrayHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonArrayHeader& common() const + FASTDDS_EXPORTED_API inline const CommonArrayHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonArrayHeader& common() + FASTDDS_EXPORTED_API inline CommonArrayHeader& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalArrayHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalArrayHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3777,87 +3777,87 @@ class CompleteArrayType { public: - RTPS_DllAPI CompleteArrayType(); - RTPS_DllAPI ~CompleteArrayType(); - RTPS_DllAPI CompleteArrayType( + FASTDDS_EXPORTED_API CompleteArrayType(); + FASTDDS_EXPORTED_API ~CompleteArrayType(); + FASTDDS_EXPORTED_API CompleteArrayType( const CompleteArrayType& x); - RTPS_DllAPI CompleteArrayType( + FASTDDS_EXPORTED_API CompleteArrayType( CompleteArrayType&& x); - RTPS_DllAPI CompleteArrayType& operator =( + FASTDDS_EXPORTED_API CompleteArrayType& operator =( const CompleteArrayType& x); - RTPS_DllAPI CompleteArrayType& operator =( + FASTDDS_EXPORTED_API CompleteArrayType& operator =( CompleteArrayType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteArrayHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteArrayHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteArrayHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteArrayHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteArrayHeader& header() + FASTDDS_EXPORTED_API inline CompleteArrayHeader& header() { return m_header; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const CompleteCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( CompleteCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const CompleteCollectionElement& element() const + FASTDDS_EXPORTED_API inline const CompleteCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline CompleteCollectionElement& element() + FASTDDS_EXPORTED_API inline CompleteCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteArrayType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteArrayType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3877,87 +3877,87 @@ class MinimalArrayType { public: - RTPS_DllAPI MinimalArrayType(); - RTPS_DllAPI ~MinimalArrayType(); - RTPS_DllAPI MinimalArrayType( + FASTDDS_EXPORTED_API MinimalArrayType(); + FASTDDS_EXPORTED_API ~MinimalArrayType(); + FASTDDS_EXPORTED_API MinimalArrayType( const MinimalArrayType& x); - RTPS_DllAPI MinimalArrayType( + FASTDDS_EXPORTED_API MinimalArrayType( MinimalArrayType&& x); - RTPS_DllAPI MinimalArrayType& operator =( + FASTDDS_EXPORTED_API MinimalArrayType& operator =( const MinimalArrayType& x); - RTPS_DllAPI MinimalArrayType& operator =( + FASTDDS_EXPORTED_API MinimalArrayType& operator =( MinimalArrayType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalArrayHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalArrayHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalArrayHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalArrayHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalArrayHeader& header() + FASTDDS_EXPORTED_API inline MinimalArrayHeader& header() { return m_header; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const MinimalCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( MinimalCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const MinimalCollectionElement& element() const + FASTDDS_EXPORTED_API inline const MinimalCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline MinimalCollectionElement& element() + FASTDDS_EXPORTED_API inline MinimalCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalArrayType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalArrayType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -3979,109 +3979,109 @@ class CompleteMapType final { public: - RTPS_DllAPI CompleteMapType(); - RTPS_DllAPI ~CompleteMapType(); - RTPS_DllAPI CompleteMapType( + FASTDDS_EXPORTED_API CompleteMapType(); + FASTDDS_EXPORTED_API ~CompleteMapType(); + FASTDDS_EXPORTED_API CompleteMapType( const CompleteMapType& x); - RTPS_DllAPI CompleteMapType( + FASTDDS_EXPORTED_API CompleteMapType( CompleteMapType&& x); - RTPS_DllAPI CompleteMapType& operator =( + FASTDDS_EXPORTED_API CompleteMapType& operator =( const CompleteMapType& x); - RTPS_DllAPI CompleteMapType& operator =( + FASTDDS_EXPORTED_API CompleteMapType& operator =( CompleteMapType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteCollectionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteCollectionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteCollectionHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteCollectionHeader& header() + FASTDDS_EXPORTED_API inline CompleteCollectionHeader& header() { return m_header; } - RTPS_DllAPI inline void key( + FASTDDS_EXPORTED_API inline void key( const CompleteCollectionElement& _key) { m_key = _key; } - RTPS_DllAPI inline void key( + FASTDDS_EXPORTED_API inline void key( CompleteCollectionElement&& _key) { m_key = std::move(_key); } - RTPS_DllAPI inline const CompleteCollectionElement& key() const + FASTDDS_EXPORTED_API inline const CompleteCollectionElement& key() const { return m_key; } - RTPS_DllAPI inline CompleteCollectionElement& key() + FASTDDS_EXPORTED_API inline CompleteCollectionElement& key() { return m_key; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const CompleteCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( CompleteCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const CompleteCollectionElement& element() const + FASTDDS_EXPORTED_API inline const CompleteCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline CompleteCollectionElement& element() + FASTDDS_EXPORTED_API inline CompleteCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteMapType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteMapType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4102,109 +4102,109 @@ class MinimalMapType final { public: - RTPS_DllAPI MinimalMapType(); - RTPS_DllAPI ~MinimalMapType(); - RTPS_DllAPI MinimalMapType( + FASTDDS_EXPORTED_API MinimalMapType(); + FASTDDS_EXPORTED_API ~MinimalMapType(); + FASTDDS_EXPORTED_API MinimalMapType( const MinimalMapType& x); - RTPS_DllAPI MinimalMapType( + FASTDDS_EXPORTED_API MinimalMapType( MinimalMapType&& x); - RTPS_DllAPI MinimalMapType& operator =( + FASTDDS_EXPORTED_API MinimalMapType& operator =( const MinimalMapType& x); - RTPS_DllAPI MinimalMapType& operator =( + FASTDDS_EXPORTED_API MinimalMapType& operator =( MinimalMapType&& x); - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( const CollectionTypeFlag& _collection_flag) { m_collection_flag = _collection_flag; } - RTPS_DllAPI inline void collection_flag( + FASTDDS_EXPORTED_API inline void collection_flag( CollectionTypeFlag&& _collection_flag) { m_collection_flag = std::move(_collection_flag); } - RTPS_DllAPI inline const CollectionTypeFlag& collection_flag() const + FASTDDS_EXPORTED_API inline const CollectionTypeFlag& collection_flag() const { return m_collection_flag; } - RTPS_DllAPI inline CollectionTypeFlag& collection_flag() + FASTDDS_EXPORTED_API inline CollectionTypeFlag& collection_flag() { return m_collection_flag; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalCollectionHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalCollectionHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalCollectionHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalCollectionHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalCollectionHeader& header() + FASTDDS_EXPORTED_API inline MinimalCollectionHeader& header() { return m_header; } - RTPS_DllAPI inline void key( + FASTDDS_EXPORTED_API inline void key( const MinimalCollectionElement& _key) { m_key = _key; } - RTPS_DllAPI inline void key( + FASTDDS_EXPORTED_API inline void key( MinimalCollectionElement&& _key) { m_key = std::move(_key); } - RTPS_DllAPI inline const MinimalCollectionElement& key() const + FASTDDS_EXPORTED_API inline const MinimalCollectionElement& key() const { return m_key; } - RTPS_DllAPI inline MinimalCollectionElement& key() + FASTDDS_EXPORTED_API inline MinimalCollectionElement& key() { return m_key; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( const MinimalCollectionElement& _element) { m_element = _element; } - RTPS_DllAPI inline void element( + FASTDDS_EXPORTED_API inline void element( MinimalCollectionElement&& _element) { m_element = std::move(_element); } - RTPS_DllAPI inline const MinimalCollectionElement& element() const + FASTDDS_EXPORTED_API inline const MinimalCollectionElement& element() const { return m_element; } - RTPS_DllAPI inline MinimalCollectionElement& element() + FASTDDS_EXPORTED_API inline MinimalCollectionElement& element() { return m_element; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalMapType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalMapType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4229,65 +4229,65 @@ class CommonEnumeratedLiteral { public: - RTPS_DllAPI CommonEnumeratedLiteral(); - RTPS_DllAPI ~CommonEnumeratedLiteral(); - RTPS_DllAPI CommonEnumeratedLiteral( + FASTDDS_EXPORTED_API CommonEnumeratedLiteral(); + FASTDDS_EXPORTED_API ~CommonEnumeratedLiteral(); + FASTDDS_EXPORTED_API CommonEnumeratedLiteral( const CommonEnumeratedLiteral& x); - RTPS_DllAPI CommonEnumeratedLiteral( + FASTDDS_EXPORTED_API CommonEnumeratedLiteral( CommonEnumeratedLiteral&& x); - RTPS_DllAPI CommonEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API CommonEnumeratedLiteral& operator =( const CommonEnumeratedLiteral& x); - RTPS_DllAPI CommonEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API CommonEnumeratedLiteral& operator =( CommonEnumeratedLiteral&& x); - RTPS_DllAPI inline void value( + FASTDDS_EXPORTED_API inline void value( const int32_t& _value) { m_value = _value; } - RTPS_DllAPI inline void value( + FASTDDS_EXPORTED_API inline void value( int32_t&& _value) { m_value = std::move(_value); } - RTPS_DllAPI inline const int32_t& value() const + FASTDDS_EXPORTED_API inline const int32_t& value() const { return m_value; } - RTPS_DllAPI inline int32_t& value() + FASTDDS_EXPORTED_API inline int32_t& value() { return m_value; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( const EnumeratedLiteralFlag& _flags) { m_flags = _flags; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( EnumeratedLiteralFlag&& _flags) { m_flags = std::move(_flags); } - RTPS_DllAPI inline const EnumeratedLiteralFlag& flags() const + FASTDDS_EXPORTED_API inline const EnumeratedLiteralFlag& flags() const { return m_flags; } - RTPS_DllAPI inline EnumeratedLiteralFlag& flags() + FASTDDS_EXPORTED_API inline EnumeratedLiteralFlag& flags() { return m_flags; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonEnumeratedLiteral& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonEnumeratedLiteral& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4307,65 +4307,65 @@ class CompleteEnumeratedLiteral { public: - RTPS_DllAPI CompleteEnumeratedLiteral(); - RTPS_DllAPI ~CompleteEnumeratedLiteral(); - RTPS_DllAPI CompleteEnumeratedLiteral( + FASTDDS_EXPORTED_API CompleteEnumeratedLiteral(); + FASTDDS_EXPORTED_API ~CompleteEnumeratedLiteral(); + FASTDDS_EXPORTED_API CompleteEnumeratedLiteral( const CompleteEnumeratedLiteral& x); - RTPS_DllAPI CompleteEnumeratedLiteral( + FASTDDS_EXPORTED_API CompleteEnumeratedLiteral( CompleteEnumeratedLiteral&& x); - RTPS_DllAPI CompleteEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedLiteral& operator =( const CompleteEnumeratedLiteral& x); - RTPS_DllAPI CompleteEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedLiteral& operator =( CompleteEnumeratedLiteral&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonEnumeratedLiteral& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonEnumeratedLiteral&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonEnumeratedLiteral& common() const + FASTDDS_EXPORTED_API inline const CommonEnumeratedLiteral& common() const { return m_common; } - RTPS_DllAPI inline CommonEnumeratedLiteral& common() + FASTDDS_EXPORTED_API inline CommonEnumeratedLiteral& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteMemberDetail& detail() + FASTDDS_EXPORTED_API inline CompleteMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteEnumeratedLiteral& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteEnumeratedLiteral& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4387,65 +4387,65 @@ class MinimalEnumeratedLiteral { public: - RTPS_DllAPI MinimalEnumeratedLiteral(); - RTPS_DllAPI ~MinimalEnumeratedLiteral(); - RTPS_DllAPI MinimalEnumeratedLiteral( + FASTDDS_EXPORTED_API MinimalEnumeratedLiteral(); + FASTDDS_EXPORTED_API ~MinimalEnumeratedLiteral(); + FASTDDS_EXPORTED_API MinimalEnumeratedLiteral( const MinimalEnumeratedLiteral& x); - RTPS_DllAPI MinimalEnumeratedLiteral( + FASTDDS_EXPORTED_API MinimalEnumeratedLiteral( MinimalEnumeratedLiteral&& x); - RTPS_DllAPI MinimalEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedLiteral& operator =( const MinimalEnumeratedLiteral& x); - RTPS_DllAPI MinimalEnumeratedLiteral& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedLiteral& operator =( MinimalEnumeratedLiteral&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonEnumeratedLiteral& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonEnumeratedLiteral&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonEnumeratedLiteral& common() const + FASTDDS_EXPORTED_API inline const CommonEnumeratedLiteral& common() const { return m_common; } - RTPS_DllAPI inline CommonEnumeratedLiteral& common() + FASTDDS_EXPORTED_API inline CommonEnumeratedLiteral& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalMemberDetail& detail() + FASTDDS_EXPORTED_API inline MinimalMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalEnumeratedLiteral& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalEnumeratedLiteral& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4465,43 +4465,43 @@ class CommonEnumeratedHeader final { public: - RTPS_DllAPI CommonEnumeratedHeader(); - RTPS_DllAPI ~CommonEnumeratedHeader(); - RTPS_DllAPI CommonEnumeratedHeader( + FASTDDS_EXPORTED_API CommonEnumeratedHeader(); + FASTDDS_EXPORTED_API ~CommonEnumeratedHeader(); + FASTDDS_EXPORTED_API CommonEnumeratedHeader( const CommonEnumeratedHeader& x); - RTPS_DllAPI CommonEnumeratedHeader( + FASTDDS_EXPORTED_API CommonEnumeratedHeader( CommonEnumeratedHeader&& x); - RTPS_DllAPI CommonEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API CommonEnumeratedHeader& operator =( const CommonEnumeratedHeader& x); - RTPS_DllAPI CommonEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API CommonEnumeratedHeader& operator =( CommonEnumeratedHeader&& x); - RTPS_DllAPI inline void bit_bound( + FASTDDS_EXPORTED_API inline void bit_bound( const BitBound& _bit_bound) { m_bit_bound = _bit_bound; } - RTPS_DllAPI inline void bit_bound( + FASTDDS_EXPORTED_API inline void bit_bound( BitBound&& _bit_bound) { m_bit_bound = std::move(_bit_bound); } - RTPS_DllAPI inline const BitBound& bit_bound() const + FASTDDS_EXPORTED_API inline const BitBound& bit_bound() const { return m_bit_bound; } - RTPS_DllAPI inline BitBound& bit_bound() + FASTDDS_EXPORTED_API inline BitBound& bit_bound() { return m_bit_bound; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonEnumeratedHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonEnumeratedHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4518,65 +4518,65 @@ class CompleteEnumeratedHeader { public: - RTPS_DllAPI CompleteEnumeratedHeader(); - RTPS_DllAPI ~CompleteEnumeratedHeader(); - RTPS_DllAPI CompleteEnumeratedHeader( + FASTDDS_EXPORTED_API CompleteEnumeratedHeader(); + FASTDDS_EXPORTED_API ~CompleteEnumeratedHeader(); + FASTDDS_EXPORTED_API CompleteEnumeratedHeader( const CompleteEnumeratedHeader& x); - RTPS_DllAPI CompleteEnumeratedHeader( + FASTDDS_EXPORTED_API CompleteEnumeratedHeader( CompleteEnumeratedHeader&& x); - RTPS_DllAPI CompleteEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedHeader& operator =( const CompleteEnumeratedHeader& x); - RTPS_DllAPI CompleteEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedHeader& operator =( CompleteEnumeratedHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonEnumeratedHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonEnumeratedHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonEnumeratedHeader& common() const + FASTDDS_EXPORTED_API inline const CommonEnumeratedHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonEnumeratedHeader& common() + FASTDDS_EXPORTED_API inline CommonEnumeratedHeader& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteEnumeratedHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteEnumeratedHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4593,43 +4593,43 @@ class MinimalEnumeratedHeader { public: - RTPS_DllAPI MinimalEnumeratedHeader(); - RTPS_DllAPI ~MinimalEnumeratedHeader(); - RTPS_DllAPI MinimalEnumeratedHeader( + FASTDDS_EXPORTED_API MinimalEnumeratedHeader(); + FASTDDS_EXPORTED_API ~MinimalEnumeratedHeader(); + FASTDDS_EXPORTED_API MinimalEnumeratedHeader( const MinimalEnumeratedHeader& x); - RTPS_DllAPI MinimalEnumeratedHeader( + FASTDDS_EXPORTED_API MinimalEnumeratedHeader( MinimalEnumeratedHeader&& x); - RTPS_DllAPI MinimalEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedHeader& operator =( const MinimalEnumeratedHeader& x); - RTPS_DllAPI MinimalEnumeratedHeader& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedHeader& operator =( MinimalEnumeratedHeader&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonEnumeratedHeader& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonEnumeratedHeader&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonEnumeratedHeader& common() const + FASTDDS_EXPORTED_API inline const CommonEnumeratedHeader& common() const { return m_common; } - RTPS_DllAPI inline CommonEnumeratedHeader& common() + FASTDDS_EXPORTED_API inline CommonEnumeratedHeader& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalEnumeratedHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalEnumeratedHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4648,87 +4648,87 @@ class CompleteEnumeratedType { public: - RTPS_DllAPI CompleteEnumeratedType(); - RTPS_DllAPI ~CompleteEnumeratedType(); - RTPS_DllAPI CompleteEnumeratedType( + FASTDDS_EXPORTED_API CompleteEnumeratedType(); + FASTDDS_EXPORTED_API ~CompleteEnumeratedType(); + FASTDDS_EXPORTED_API CompleteEnumeratedType( const CompleteEnumeratedType& x); - RTPS_DllAPI CompleteEnumeratedType( + FASTDDS_EXPORTED_API CompleteEnumeratedType( CompleteEnumeratedType&& x); - RTPS_DllAPI CompleteEnumeratedType& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedType& operator =( const CompleteEnumeratedType& x); - RTPS_DllAPI CompleteEnumeratedType& operator =( + FASTDDS_EXPORTED_API CompleteEnumeratedType& operator =( CompleteEnumeratedType&& x); - RTPS_DllAPI inline void enum_flags( + FASTDDS_EXPORTED_API inline void enum_flags( const EnumTypeFlag& _enum_flags) { m_enum_flags = _enum_flags; } - RTPS_DllAPI inline void enum_flags( + FASTDDS_EXPORTED_API inline void enum_flags( EnumTypeFlag&& _enum_flags) { m_enum_flags = std::move(_enum_flags); } - RTPS_DllAPI inline const EnumTypeFlag& enum_flags() const + FASTDDS_EXPORTED_API inline const EnumTypeFlag& enum_flags() const { return m_enum_flags; } - RTPS_DllAPI inline EnumTypeFlag& enum_flags() + FASTDDS_EXPORTED_API inline EnumTypeFlag& enum_flags() { return m_enum_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteEnumeratedHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteEnumeratedHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteEnumeratedHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteEnumeratedHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteEnumeratedHeader& header() + FASTDDS_EXPORTED_API inline CompleteEnumeratedHeader& header() { return m_header; } - RTPS_DllAPI inline void literal_seq( + FASTDDS_EXPORTED_API inline void literal_seq( const CompleteEnumeratedLiteralSeq& _literal_seq) { m_literal_seq = _literal_seq; } - RTPS_DllAPI inline void literal_seq( + FASTDDS_EXPORTED_API inline void literal_seq( CompleteEnumeratedLiteralSeq&& _literal_seq) { m_literal_seq = std::move(_literal_seq); } - RTPS_DllAPI inline const CompleteEnumeratedLiteralSeq& literal_seq() const + FASTDDS_EXPORTED_API inline const CompleteEnumeratedLiteralSeq& literal_seq() const { return m_literal_seq; } - RTPS_DllAPI inline CompleteEnumeratedLiteralSeq& literal_seq() + FASTDDS_EXPORTED_API inline CompleteEnumeratedLiteralSeq& literal_seq() { return m_literal_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteEnumeratedType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteEnumeratedType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4748,87 +4748,87 @@ class MinimalEnumeratedType { public: - RTPS_DllAPI MinimalEnumeratedType(); - RTPS_DllAPI ~MinimalEnumeratedType(); - RTPS_DllAPI MinimalEnumeratedType( + FASTDDS_EXPORTED_API MinimalEnumeratedType(); + FASTDDS_EXPORTED_API ~MinimalEnumeratedType(); + FASTDDS_EXPORTED_API MinimalEnumeratedType( const MinimalEnumeratedType& x); - RTPS_DllAPI MinimalEnumeratedType( + FASTDDS_EXPORTED_API MinimalEnumeratedType( MinimalEnumeratedType&& x); - RTPS_DllAPI MinimalEnumeratedType& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedType& operator =( const MinimalEnumeratedType& x); - RTPS_DllAPI MinimalEnumeratedType& operator =( + FASTDDS_EXPORTED_API MinimalEnumeratedType& operator =( MinimalEnumeratedType&& x); - RTPS_DllAPI inline void enum_flags( + FASTDDS_EXPORTED_API inline void enum_flags( const EnumTypeFlag& _enum_flags) { m_enum_flags = _enum_flags; } - RTPS_DllAPI inline void enum_flags( + FASTDDS_EXPORTED_API inline void enum_flags( EnumTypeFlag&& _enum_flags) { m_enum_flags = std::move(_enum_flags); } - RTPS_DllAPI inline const EnumTypeFlag& enum_flags() const + FASTDDS_EXPORTED_API inline const EnumTypeFlag& enum_flags() const { return m_enum_flags; } - RTPS_DllAPI inline EnumTypeFlag& enum_flags() + FASTDDS_EXPORTED_API inline EnumTypeFlag& enum_flags() { return m_enum_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalEnumeratedHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalEnumeratedHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalEnumeratedHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalEnumeratedHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalEnumeratedHeader& header() + FASTDDS_EXPORTED_API inline MinimalEnumeratedHeader& header() { return m_header; } - RTPS_DllAPI inline void literal_seq( + FASTDDS_EXPORTED_API inline void literal_seq( const MinimalEnumeratedLiteralSeq& _literal_seq) { m_literal_seq = _literal_seq; } - RTPS_DllAPI inline void literal_seq( + FASTDDS_EXPORTED_API inline void literal_seq( MinimalEnumeratedLiteralSeq&& _literal_seq) { m_literal_seq = std::move(_literal_seq); } - RTPS_DllAPI inline const MinimalEnumeratedLiteralSeq& literal_seq() const + FASTDDS_EXPORTED_API inline const MinimalEnumeratedLiteralSeq& literal_seq() const { return m_literal_seq; } - RTPS_DllAPI inline MinimalEnumeratedLiteralSeq& literal_seq() + FASTDDS_EXPORTED_API inline MinimalEnumeratedLiteralSeq& literal_seq() { return m_literal_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalEnumeratedType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalEnumeratedType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4849,65 +4849,65 @@ class CommonBitflag final { public: - RTPS_DllAPI CommonBitflag(); - RTPS_DllAPI ~CommonBitflag(); - RTPS_DllAPI CommonBitflag( + FASTDDS_EXPORTED_API CommonBitflag(); + FASTDDS_EXPORTED_API ~CommonBitflag(); + FASTDDS_EXPORTED_API CommonBitflag( const CommonBitflag& x); - RTPS_DllAPI CommonBitflag( + FASTDDS_EXPORTED_API CommonBitflag( CommonBitflag&& x); - RTPS_DllAPI CommonBitflag& operator =( + FASTDDS_EXPORTED_API CommonBitflag& operator =( const CommonBitflag& x); - RTPS_DllAPI CommonBitflag& operator =( + FASTDDS_EXPORTED_API CommonBitflag& operator =( CommonBitflag&& x); - RTPS_DllAPI inline void position( + FASTDDS_EXPORTED_API inline void position( const uint16_t& _position) { m_position = _position; } - RTPS_DllAPI inline void position( + FASTDDS_EXPORTED_API inline void position( uint16_t&& _position) { m_position = std::move(_position); } - RTPS_DllAPI inline const uint16_t& position() const + FASTDDS_EXPORTED_API inline const uint16_t& position() const { return m_position; } - RTPS_DllAPI inline uint16_t& position() + FASTDDS_EXPORTED_API inline uint16_t& position() { return m_position; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( const BitflagFlag& _flags) { m_flags = _flags; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( BitflagFlag&& _flags) { m_flags = std::move(_flags); } - RTPS_DllAPI inline const BitflagFlag& flags() const + FASTDDS_EXPORTED_API inline const BitflagFlag& flags() const { return m_flags; } - RTPS_DllAPI inline BitflagFlag& flags() + FASTDDS_EXPORTED_API inline BitflagFlag& flags() { return m_flags; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonBitflag& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonBitflag& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -4925,65 +4925,65 @@ class CompleteBitflag { public: - RTPS_DllAPI CompleteBitflag(); - RTPS_DllAPI ~CompleteBitflag(); - RTPS_DllAPI CompleteBitflag( + FASTDDS_EXPORTED_API CompleteBitflag(); + FASTDDS_EXPORTED_API ~CompleteBitflag(); + FASTDDS_EXPORTED_API CompleteBitflag( const CompleteBitflag& x); - RTPS_DllAPI CompleteBitflag( + FASTDDS_EXPORTED_API CompleteBitflag( CompleteBitflag&& x); - RTPS_DllAPI CompleteBitflag& operator =( + FASTDDS_EXPORTED_API CompleteBitflag& operator =( const CompleteBitflag& x); - RTPS_DllAPI CompleteBitflag& operator =( + FASTDDS_EXPORTED_API CompleteBitflag& operator =( CompleteBitflag&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonBitflag& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonBitflag&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonBitflag& common() const + FASTDDS_EXPORTED_API inline const CommonBitflag& common() const { return m_common; } - RTPS_DllAPI inline CommonBitflag& common() + FASTDDS_EXPORTED_API inline CommonBitflag& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteMemberDetail& detail() + FASTDDS_EXPORTED_API inline CompleteMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteBitflag& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteBitflag& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5002,65 +5002,65 @@ class MinimalBitflag { public: - RTPS_DllAPI MinimalBitflag(); - RTPS_DllAPI ~MinimalBitflag(); - RTPS_DllAPI MinimalBitflag( + FASTDDS_EXPORTED_API MinimalBitflag(); + FASTDDS_EXPORTED_API ~MinimalBitflag(); + FASTDDS_EXPORTED_API MinimalBitflag( const MinimalBitflag& x); - RTPS_DllAPI MinimalBitflag( + FASTDDS_EXPORTED_API MinimalBitflag( MinimalBitflag&& x); - RTPS_DllAPI MinimalBitflag& operator =( + FASTDDS_EXPORTED_API MinimalBitflag& operator =( const MinimalBitflag& x); - RTPS_DllAPI MinimalBitflag& operator =( + FASTDDS_EXPORTED_API MinimalBitflag& operator =( MinimalBitflag&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonBitflag& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonBitflag&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonBitflag& common() const + FASTDDS_EXPORTED_API inline const CommonBitflag& common() const { return m_common; } - RTPS_DllAPI inline CommonBitflag& common() + FASTDDS_EXPORTED_API inline CommonBitflag& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const MinimalMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( MinimalMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const MinimalMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const MinimalMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline MinimalMemberDetail& detail() + FASTDDS_EXPORTED_API inline MinimalMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalBitflag& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalBitflag& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5080,43 +5080,43 @@ class CommonBitmaskHeader final { public: - RTPS_DllAPI CommonBitmaskHeader(); - RTPS_DllAPI ~CommonBitmaskHeader(); - RTPS_DllAPI CommonBitmaskHeader( + FASTDDS_EXPORTED_API CommonBitmaskHeader(); + FASTDDS_EXPORTED_API ~CommonBitmaskHeader(); + FASTDDS_EXPORTED_API CommonBitmaskHeader( const CommonBitmaskHeader& x); - RTPS_DllAPI CommonBitmaskHeader( + FASTDDS_EXPORTED_API CommonBitmaskHeader( CommonBitmaskHeader&& x); - RTPS_DllAPI CommonBitmaskHeader& operator =( + FASTDDS_EXPORTED_API CommonBitmaskHeader& operator =( const CommonBitmaskHeader& x); - RTPS_DllAPI CommonBitmaskHeader& operator =( + FASTDDS_EXPORTED_API CommonBitmaskHeader& operator =( CommonBitmaskHeader&& x); - RTPS_DllAPI inline void bit_bound( + FASTDDS_EXPORTED_API inline void bit_bound( const BitBound& _bit_bound) { m_bit_bound = _bit_bound; } - RTPS_DllAPI inline void bit_bound( + FASTDDS_EXPORTED_API inline void bit_bound( BitBound&& _bit_bound) { m_bit_bound = std::move(_bit_bound); } - RTPS_DllAPI inline const BitBound& bit_bound() const + FASTDDS_EXPORTED_API inline const BitBound& bit_bound() const { return m_bit_bound; } - RTPS_DllAPI inline BitBound& bit_bound() + FASTDDS_EXPORTED_API inline BitBound& bit_bound() { return m_bit_bound; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonBitmaskHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonBitmaskHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5136,87 +5136,87 @@ class CompleteBitmaskType { public: - RTPS_DllAPI CompleteBitmaskType(); - RTPS_DllAPI ~CompleteBitmaskType(); - RTPS_DllAPI CompleteBitmaskType( + FASTDDS_EXPORTED_API CompleteBitmaskType(); + FASTDDS_EXPORTED_API ~CompleteBitmaskType(); + FASTDDS_EXPORTED_API CompleteBitmaskType( const CompleteBitmaskType& x); - RTPS_DllAPI CompleteBitmaskType( + FASTDDS_EXPORTED_API CompleteBitmaskType( CompleteBitmaskType&& x); - RTPS_DllAPI CompleteBitmaskType& operator =( + FASTDDS_EXPORTED_API CompleteBitmaskType& operator =( const CompleteBitmaskType& x); - RTPS_DllAPI CompleteBitmaskType& operator =( + FASTDDS_EXPORTED_API CompleteBitmaskType& operator =( CompleteBitmaskType&& x); - RTPS_DllAPI inline void bitmask_flags( + FASTDDS_EXPORTED_API inline void bitmask_flags( const BitmaskTypeFlag& _bitmask_flags) { m_bitmask_flags = _bitmask_flags; } - RTPS_DllAPI inline void bitmask_flags( + FASTDDS_EXPORTED_API inline void bitmask_flags( BitmaskTypeFlag&& _bitmask_flags) { m_bitmask_flags = std::move(_bitmask_flags); } - RTPS_DllAPI inline const BitmaskTypeFlag& bitmask_flags() const + FASTDDS_EXPORTED_API inline const BitmaskTypeFlag& bitmask_flags() const { return m_bitmask_flags; } - RTPS_DllAPI inline BitmaskTypeFlag& bitmask_flags() + FASTDDS_EXPORTED_API inline BitmaskTypeFlag& bitmask_flags() { return m_bitmask_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteBitmaskHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteBitmaskHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteBitmaskHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteBitmaskHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteBitmaskHeader& header() + FASTDDS_EXPORTED_API inline CompleteBitmaskHeader& header() { return m_header; } - RTPS_DllAPI inline void flag_seq( + FASTDDS_EXPORTED_API inline void flag_seq( const CompleteBitflagSeq& _flag_seq) { m_flag_seq = _flag_seq; } - RTPS_DllAPI inline void flag_seq( + FASTDDS_EXPORTED_API inline void flag_seq( CompleteBitflagSeq&& _flag_seq) { m_flag_seq = std::move(_flag_seq); } - RTPS_DllAPI inline const CompleteBitflagSeq& flag_seq() const + FASTDDS_EXPORTED_API inline const CompleteBitflagSeq& flag_seq() const { return m_flag_seq; } - RTPS_DllAPI inline CompleteBitflagSeq& flag_seq() + FASTDDS_EXPORTED_API inline CompleteBitflagSeq& flag_seq() { return m_flag_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteBitmaskType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteBitmaskType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5236,87 +5236,87 @@ class MinimalBitmaskType { public: - RTPS_DllAPI MinimalBitmaskType(); - RTPS_DllAPI ~MinimalBitmaskType(); - RTPS_DllAPI MinimalBitmaskType( + FASTDDS_EXPORTED_API MinimalBitmaskType(); + FASTDDS_EXPORTED_API ~MinimalBitmaskType(); + FASTDDS_EXPORTED_API MinimalBitmaskType( const MinimalBitmaskType& x); - RTPS_DllAPI MinimalBitmaskType( + FASTDDS_EXPORTED_API MinimalBitmaskType( MinimalBitmaskType&& x); - RTPS_DllAPI MinimalBitmaskType& operator =( + FASTDDS_EXPORTED_API MinimalBitmaskType& operator =( const MinimalBitmaskType& x); - RTPS_DllAPI MinimalBitmaskType& operator =( + FASTDDS_EXPORTED_API MinimalBitmaskType& operator =( MinimalBitmaskType&& x); - RTPS_DllAPI inline void bitmask_flags( + FASTDDS_EXPORTED_API inline void bitmask_flags( const BitmaskTypeFlag& _bitmask_flags) { m_bitmask_flags = _bitmask_flags; } - RTPS_DllAPI inline void bitmask_flags( + FASTDDS_EXPORTED_API inline void bitmask_flags( BitmaskTypeFlag&& _bitmask_flags) { m_bitmask_flags = std::move(_bitmask_flags); } - RTPS_DllAPI inline const BitmaskTypeFlag& bitmask_flags() const + FASTDDS_EXPORTED_API inline const BitmaskTypeFlag& bitmask_flags() const { return m_bitmask_flags; } - RTPS_DllAPI inline BitmaskTypeFlag& bitmask_flags() + FASTDDS_EXPORTED_API inline BitmaskTypeFlag& bitmask_flags() { return m_bitmask_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalBitmaskHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalBitmaskHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalBitmaskHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalBitmaskHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalBitmaskHeader& header() + FASTDDS_EXPORTED_API inline MinimalBitmaskHeader& header() { return m_header; } - RTPS_DllAPI inline void flag_seq( + FASTDDS_EXPORTED_API inline void flag_seq( const MinimalBitflagSeq& _flag_seq) { m_flag_seq = _flag_seq; } - RTPS_DllAPI inline void flag_seq( + FASTDDS_EXPORTED_API inline void flag_seq( MinimalBitflagSeq&& _flag_seq) { m_flag_seq = std::move(_flag_seq); } - RTPS_DllAPI inline const MinimalBitflagSeq& flag_seq() const + FASTDDS_EXPORTED_API inline const MinimalBitflagSeq& flag_seq() const { return m_flag_seq; } - RTPS_DllAPI inline MinimalBitflagSeq& flag_seq() + FASTDDS_EXPORTED_API inline MinimalBitflagSeq& flag_seq() { return m_flag_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalBitmaskType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalBitmaskType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5338,109 +5338,109 @@ class CommonBitfield final { public: - RTPS_DllAPI CommonBitfield(); - RTPS_DllAPI ~CommonBitfield(); - RTPS_DllAPI CommonBitfield( + FASTDDS_EXPORTED_API CommonBitfield(); + FASTDDS_EXPORTED_API ~CommonBitfield(); + FASTDDS_EXPORTED_API CommonBitfield( const CommonBitfield& x); - RTPS_DllAPI CommonBitfield( + FASTDDS_EXPORTED_API CommonBitfield( CommonBitfield&& x); - RTPS_DllAPI CommonBitfield& operator =( + FASTDDS_EXPORTED_API CommonBitfield& operator =( const CommonBitfield& x); - RTPS_DllAPI CommonBitfield& operator =( + FASTDDS_EXPORTED_API CommonBitfield& operator =( CommonBitfield&& x); - RTPS_DllAPI inline void position( + FASTDDS_EXPORTED_API inline void position( const uint16_t& _position) { m_position = _position; } - RTPS_DllAPI inline void position( + FASTDDS_EXPORTED_API inline void position( uint16_t&& _position) { m_position = std::move(_position); } - RTPS_DllAPI inline const uint16_t& position() const + FASTDDS_EXPORTED_API inline const uint16_t& position() const { return m_position; } - RTPS_DllAPI inline uint16_t& position() + FASTDDS_EXPORTED_API inline uint16_t& position() { return m_position; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( const BitsetMemberFlag& _flags) { m_flags = _flags; } - RTPS_DllAPI inline void flags( + FASTDDS_EXPORTED_API inline void flags( BitsetMemberFlag&& _flags) { m_flags = std::move(_flags); } - RTPS_DllAPI inline const BitsetMemberFlag& flags() const + FASTDDS_EXPORTED_API inline const BitsetMemberFlag& flags() const { return m_flags; } - RTPS_DllAPI inline BitsetMemberFlag& flags() + FASTDDS_EXPORTED_API inline BitsetMemberFlag& flags() { return m_flags; } - RTPS_DllAPI inline void bitcount( + FASTDDS_EXPORTED_API inline void bitcount( const octet& _bitcount) { m_bitcount = _bitcount; } - RTPS_DllAPI inline void bitcount( + FASTDDS_EXPORTED_API inline void bitcount( octet&& _bitcount) { m_bitcount = std::move(_bitcount); } - RTPS_DllAPI inline const octet& bitcount() const + FASTDDS_EXPORTED_API inline const octet& bitcount() const { return m_bitcount; } - RTPS_DllAPI inline octet& bitcount() + FASTDDS_EXPORTED_API inline octet& bitcount() { return m_bitcount; } - RTPS_DllAPI inline void holder_type( + FASTDDS_EXPORTED_API inline void holder_type( const TypeKind& _holder_type) { m_holder_type = _holder_type; } - RTPS_DllAPI inline void holder_type( + FASTDDS_EXPORTED_API inline void holder_type( TypeKind&& _holder_type) { m_holder_type = std::move(_holder_type); } - RTPS_DllAPI inline const TypeKind& holder_type() const + FASTDDS_EXPORTED_API inline const TypeKind& holder_type() const { return m_holder_type; } - RTPS_DllAPI inline TypeKind& holder_type() + FASTDDS_EXPORTED_API inline TypeKind& holder_type() { return m_holder_type; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CommonBitfield& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CommonBitfield& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5460,65 +5460,65 @@ class CompleteBitfield { public: - RTPS_DllAPI CompleteBitfield(); - RTPS_DllAPI ~CompleteBitfield(); - RTPS_DllAPI CompleteBitfield( + FASTDDS_EXPORTED_API CompleteBitfield(); + FASTDDS_EXPORTED_API ~CompleteBitfield(); + FASTDDS_EXPORTED_API CompleteBitfield( const CompleteBitfield& x); - RTPS_DllAPI CompleteBitfield( + FASTDDS_EXPORTED_API CompleteBitfield( CompleteBitfield&& x); - RTPS_DllAPI CompleteBitfield& operator =( + FASTDDS_EXPORTED_API CompleteBitfield& operator =( const CompleteBitfield& x); - RTPS_DllAPI CompleteBitfield& operator =( + FASTDDS_EXPORTED_API CompleteBitfield& operator =( CompleteBitfield&& x); - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonBitfield& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonBitfield&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonBitfield& common() const + FASTDDS_EXPORTED_API inline const CommonBitfield& common() const { return m_common; } - RTPS_DllAPI inline CommonBitfield& common() + FASTDDS_EXPORTED_API inline CommonBitfield& common() { return m_common; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteMemberDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteMemberDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteMemberDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteMemberDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteMemberDetail& detail() + FASTDDS_EXPORTED_API inline CompleteMemberDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteBitfield& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteBitfield& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5537,65 +5537,65 @@ class MinimalBitfield { public: - RTPS_DllAPI MinimalBitfield(); - RTPS_DllAPI ~MinimalBitfield(); - RTPS_DllAPI MinimalBitfield( + FASTDDS_EXPORTED_API MinimalBitfield(); + FASTDDS_EXPORTED_API ~MinimalBitfield(); + FASTDDS_EXPORTED_API MinimalBitfield( const MinimalBitfield& x); - RTPS_DllAPI MinimalBitfield( + FASTDDS_EXPORTED_API MinimalBitfield( MinimalBitfield&& x); - RTPS_DllAPI MinimalBitfield& operator =( + FASTDDS_EXPORTED_API MinimalBitfield& operator =( const MinimalBitfield& x); - RTPS_DllAPI MinimalBitfield& operator =( + FASTDDS_EXPORTED_API MinimalBitfield& operator =( MinimalBitfield&& x); - RTPS_DllAPI inline void name_hash( + FASTDDS_EXPORTED_API inline void name_hash( const NameHash& _name_hash) { m_name_hash = _name_hash; } - RTPS_DllAPI inline void name_hash( + FASTDDS_EXPORTED_API inline void name_hash( NameHash&& _name_hash) { m_name_hash = std::move(_name_hash); } - RTPS_DllAPI inline const NameHash& name_hash() const + FASTDDS_EXPORTED_API inline const NameHash& name_hash() const { return m_name_hash; } - RTPS_DllAPI inline NameHash& name_hash() + FASTDDS_EXPORTED_API inline NameHash& name_hash() { return m_name_hash; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( const CommonBitfield& _common) { m_common = _common; } - RTPS_DllAPI inline void common( + FASTDDS_EXPORTED_API inline void common( CommonBitfield&& _common) { m_common = std::move(_common); } - RTPS_DllAPI inline const CommonBitfield& common() const + FASTDDS_EXPORTED_API inline const CommonBitfield& common() const { return m_common; } - RTPS_DllAPI inline CommonBitfield& common() + FASTDDS_EXPORTED_API inline CommonBitfield& common() { return m_common; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalBitfield& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalBitfield& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5613,65 +5613,65 @@ class CompleteBitsetHeader { public: - RTPS_DllAPI CompleteBitsetHeader(); - RTPS_DllAPI ~CompleteBitsetHeader(); - RTPS_DllAPI CompleteBitsetHeader( + FASTDDS_EXPORTED_API CompleteBitsetHeader(); + FASTDDS_EXPORTED_API ~CompleteBitsetHeader(); + FASTDDS_EXPORTED_API CompleteBitsetHeader( const CompleteBitsetHeader& x); - RTPS_DllAPI CompleteBitsetHeader( + FASTDDS_EXPORTED_API CompleteBitsetHeader( CompleteBitsetHeader&& x); - RTPS_DllAPI CompleteBitsetHeader& operator =( + FASTDDS_EXPORTED_API CompleteBitsetHeader& operator =( const CompleteBitsetHeader& x); - RTPS_DllAPI CompleteBitsetHeader& operator =( + FASTDDS_EXPORTED_API CompleteBitsetHeader& operator =( CompleteBitsetHeader&& x); - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( const TypeIdentifier& _base_type) { m_base_type = _base_type; } - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( TypeIdentifier&& _base_type) { m_base_type = std::move(_base_type); } - RTPS_DllAPI inline const TypeIdentifier& base_type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& base_type() const { return m_base_type; } - RTPS_DllAPI inline TypeIdentifier& base_type() + FASTDDS_EXPORTED_API inline TypeIdentifier& base_type() { return m_base_type; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( const CompleteTypeDetail& _detail) { m_detail = _detail; } - RTPS_DllAPI inline void detail( + FASTDDS_EXPORTED_API inline void detail( CompleteTypeDetail&& _detail) { m_detail = std::move(_detail); } - RTPS_DllAPI inline const CompleteTypeDetail& detail() const + FASTDDS_EXPORTED_API inline const CompleteTypeDetail& detail() const { return m_detail; } - RTPS_DllAPI inline CompleteTypeDetail& detail() + FASTDDS_EXPORTED_API inline CompleteTypeDetail& detail() { return m_detail; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteBitsetHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteBitsetHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5688,43 +5688,43 @@ class MinimalBitsetHeader { public: - RTPS_DllAPI MinimalBitsetHeader(); - RTPS_DllAPI ~MinimalBitsetHeader(); - RTPS_DllAPI MinimalBitsetHeader( + FASTDDS_EXPORTED_API MinimalBitsetHeader(); + FASTDDS_EXPORTED_API ~MinimalBitsetHeader(); + FASTDDS_EXPORTED_API MinimalBitsetHeader( const MinimalBitsetHeader& x); - RTPS_DllAPI MinimalBitsetHeader( + FASTDDS_EXPORTED_API MinimalBitsetHeader( MinimalBitsetHeader&& x); - RTPS_DllAPI MinimalBitsetHeader& operator =( + FASTDDS_EXPORTED_API MinimalBitsetHeader& operator =( const MinimalBitsetHeader& x); - RTPS_DllAPI MinimalBitsetHeader& operator =( + FASTDDS_EXPORTED_API MinimalBitsetHeader& operator =( MinimalBitsetHeader&& x); - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( const TypeIdentifier& _base_type) { m_base_type = _base_type; } - RTPS_DllAPI inline void base_type( + FASTDDS_EXPORTED_API inline void base_type( TypeIdentifier&& _base_type) { m_base_type = std::move(_base_type); } - RTPS_DllAPI inline const TypeIdentifier& base_type() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& base_type() const { return m_base_type; } - RTPS_DllAPI inline TypeIdentifier& base_type() + FASTDDS_EXPORTED_API inline TypeIdentifier& base_type() { return m_base_type; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalBitsetHeader& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalBitsetHeader& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5741,87 +5741,87 @@ class CompleteBitsetType { public: - RTPS_DllAPI CompleteBitsetType(); - RTPS_DllAPI ~CompleteBitsetType(); - RTPS_DllAPI CompleteBitsetType( + FASTDDS_EXPORTED_API CompleteBitsetType(); + FASTDDS_EXPORTED_API ~CompleteBitsetType(); + FASTDDS_EXPORTED_API CompleteBitsetType( const CompleteBitsetType& x); - RTPS_DllAPI CompleteBitsetType( + FASTDDS_EXPORTED_API CompleteBitsetType( CompleteBitsetType&& x); - RTPS_DllAPI CompleteBitsetType& operator =( + FASTDDS_EXPORTED_API CompleteBitsetType& operator =( const CompleteBitsetType& x); - RTPS_DllAPI CompleteBitsetType& operator =( + FASTDDS_EXPORTED_API CompleteBitsetType& operator =( CompleteBitsetType&& x); - RTPS_DllAPI inline void bitset_flags( + FASTDDS_EXPORTED_API inline void bitset_flags( const BitsetTypeFlag& _bitset_flags) { m_bitset_flags = _bitset_flags; } - RTPS_DllAPI inline void bitset_flags( + FASTDDS_EXPORTED_API inline void bitset_flags( BitsetTypeFlag&& _bitset_flags) { m_bitset_flags = std::move(_bitset_flags); } - RTPS_DllAPI inline const BitsetTypeFlag& bitset_flags() const + FASTDDS_EXPORTED_API inline const BitsetTypeFlag& bitset_flags() const { return m_bitset_flags; } - RTPS_DllAPI inline BitsetTypeFlag& bitset_flags() + FASTDDS_EXPORTED_API inline BitsetTypeFlag& bitset_flags() { return m_bitset_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const CompleteBitsetHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( CompleteBitsetHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const CompleteBitsetHeader& header() const + FASTDDS_EXPORTED_API inline const CompleteBitsetHeader& header() const { return m_header; } - RTPS_DllAPI inline CompleteBitsetHeader& header() + FASTDDS_EXPORTED_API inline CompleteBitsetHeader& header() { return m_header; } - RTPS_DllAPI inline void field_seq( + FASTDDS_EXPORTED_API inline void field_seq( const CompleteBitfieldSeq& _field_seq) { m_field_seq = _field_seq; } - RTPS_DllAPI inline void field_seq( + FASTDDS_EXPORTED_API inline void field_seq( CompleteBitfieldSeq&& _field_seq) { m_field_seq = std::move(_field_seq); } - RTPS_DllAPI inline const CompleteBitfieldSeq& field_seq() const + FASTDDS_EXPORTED_API inline const CompleteBitfieldSeq& field_seq() const { return m_field_seq; } - RTPS_DllAPI inline CompleteBitfieldSeq& field_seq() + FASTDDS_EXPORTED_API inline CompleteBitfieldSeq& field_seq() { return m_field_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteBitsetType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteBitsetType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5841,87 +5841,87 @@ class MinimalBitsetType { public: - RTPS_DllAPI MinimalBitsetType(); - RTPS_DllAPI ~MinimalBitsetType(); - RTPS_DllAPI MinimalBitsetType( + FASTDDS_EXPORTED_API MinimalBitsetType(); + FASTDDS_EXPORTED_API ~MinimalBitsetType(); + FASTDDS_EXPORTED_API MinimalBitsetType( const MinimalBitsetType& x); - RTPS_DllAPI MinimalBitsetType( + FASTDDS_EXPORTED_API MinimalBitsetType( MinimalBitsetType&& x); - RTPS_DllAPI MinimalBitsetType& operator =( + FASTDDS_EXPORTED_API MinimalBitsetType& operator =( const MinimalBitsetType& x); - RTPS_DllAPI MinimalBitsetType& operator =( + FASTDDS_EXPORTED_API MinimalBitsetType& operator =( MinimalBitsetType&& x); - RTPS_DllAPI inline void bitset_flags( + FASTDDS_EXPORTED_API inline void bitset_flags( const BitsetTypeFlag& _bitset_flags) { m_bitset_flags = _bitset_flags; } - RTPS_DllAPI inline void bitset_flags( + FASTDDS_EXPORTED_API inline void bitset_flags( BitsetTypeFlag&& _bitset_flags) { m_bitset_flags = std::move(_bitset_flags); } - RTPS_DllAPI inline const BitsetTypeFlag& bitset_flags() const + FASTDDS_EXPORTED_API inline const BitsetTypeFlag& bitset_flags() const { return m_bitset_flags; } - RTPS_DllAPI inline BitsetTypeFlag& bitset_flags() + FASTDDS_EXPORTED_API inline BitsetTypeFlag& bitset_flags() { return m_bitset_flags; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( const MinimalBitsetHeader& _header) { m_header = _header; } - RTPS_DllAPI inline void header( + FASTDDS_EXPORTED_API inline void header( MinimalBitsetHeader&& _header) { m_header = std::move(_header); } - RTPS_DllAPI inline const MinimalBitsetHeader& header() const + FASTDDS_EXPORTED_API inline const MinimalBitsetHeader& header() const { return m_header; } - RTPS_DllAPI inline MinimalBitsetHeader& header() + FASTDDS_EXPORTED_API inline MinimalBitsetHeader& header() { return m_header; } - RTPS_DllAPI inline void field_seq( + FASTDDS_EXPORTED_API inline void field_seq( const MinimalBitfieldSeq& _field_seq) { m_field_seq = _field_seq; } - RTPS_DllAPI inline void field_seq( + FASTDDS_EXPORTED_API inline void field_seq( MinimalBitfieldSeq&& _field_seq) { m_field_seq = std::move(_field_seq); } - RTPS_DllAPI inline const MinimalBitfieldSeq& field_seq() const + FASTDDS_EXPORTED_API inline const MinimalBitfieldSeq& field_seq() const { return m_field_seq; } - RTPS_DllAPI inline MinimalBitfieldSeq& field_seq() + FASTDDS_EXPORTED_API inline MinimalBitfieldSeq& field_seq() { return m_field_seq; } - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalBitsetType& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalBitsetType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5943,24 +5943,24 @@ class CompleteExtendedType { public: - RTPS_DllAPI CompleteExtendedType(); - RTPS_DllAPI ~CompleteExtendedType(); - RTPS_DllAPI CompleteExtendedType( + FASTDDS_EXPORTED_API CompleteExtendedType(); + FASTDDS_EXPORTED_API ~CompleteExtendedType(); + FASTDDS_EXPORTED_API CompleteExtendedType( const CompleteExtendedType& x); - RTPS_DllAPI CompleteExtendedType( + FASTDDS_EXPORTED_API CompleteExtendedType( CompleteExtendedType&& x); - RTPS_DllAPI CompleteExtendedType& operator =( + FASTDDS_EXPORTED_API CompleteExtendedType& operator =( const CompleteExtendedType& x); - RTPS_DllAPI CompleteExtendedType& operator =( + FASTDDS_EXPORTED_API CompleteExtendedType& operator =( CompleteExtendedType&& x); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteExtendedType&) const { return true; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteExtendedType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -5975,24 +5975,24 @@ class MinimalExtendedType { public: - RTPS_DllAPI MinimalExtendedType(); - RTPS_DllAPI ~MinimalExtendedType(); - RTPS_DllAPI MinimalExtendedType( + FASTDDS_EXPORTED_API MinimalExtendedType(); + FASTDDS_EXPORTED_API ~MinimalExtendedType(); + FASTDDS_EXPORTED_API MinimalExtendedType( const MinimalExtendedType& x); - RTPS_DllAPI MinimalExtendedType( + FASTDDS_EXPORTED_API MinimalExtendedType( MinimalExtendedType&& x); - RTPS_DllAPI MinimalExtendedType& operator =( + FASTDDS_EXPORTED_API MinimalExtendedType& operator =( const MinimalExtendedType& x); - RTPS_DllAPI MinimalExtendedType& operator =( + FASTDDS_EXPORTED_API MinimalExtendedType& operator =( MinimalExtendedType&& x); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalExtendedType&) const { return true; } - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalExtendedType& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -6004,80 +6004,80 @@ class CompleteTypeObject final { public: - RTPS_DllAPI CompleteTypeObject(); - RTPS_DllAPI ~CompleteTypeObject(); - RTPS_DllAPI CompleteTypeObject( + FASTDDS_EXPORTED_API CompleteTypeObject(); + FASTDDS_EXPORTED_API ~CompleteTypeObject(); + FASTDDS_EXPORTED_API CompleteTypeObject( const CompleteTypeObject& x); - RTPS_DllAPI CompleteTypeObject( + FASTDDS_EXPORTED_API CompleteTypeObject( CompleteTypeObject&& x); - RTPS_DllAPI CompleteTypeObject& operator =( + FASTDDS_EXPORTED_API CompleteTypeObject& operator =( const CompleteTypeObject& x); - RTPS_DllAPI CompleteTypeObject& operator =( + FASTDDS_EXPORTED_API CompleteTypeObject& operator =( CompleteTypeObject&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( octet __d); - RTPS_DllAPI octet _d() const; - RTPS_DllAPI octet& _d(); + FASTDDS_EXPORTED_API octet _d() const; + FASTDDS_EXPORTED_API octet& _d(); - RTPS_DllAPI void alias_type( + FASTDDS_EXPORTED_API void alias_type( CompleteAliasType _alias_type); - RTPS_DllAPI const CompleteAliasType& alias_type() const; - RTPS_DllAPI CompleteAliasType& alias_type(); + FASTDDS_EXPORTED_API const CompleteAliasType& alias_type() const; + FASTDDS_EXPORTED_API CompleteAliasType& alias_type(); - RTPS_DllAPI void annotation_type( + FASTDDS_EXPORTED_API void annotation_type( CompleteAnnotationType _annotation_type); - RTPS_DllAPI const CompleteAnnotationType& annotation_type() const; - RTPS_DllAPI CompleteAnnotationType& annotation_type(); + FASTDDS_EXPORTED_API const CompleteAnnotationType& annotation_type() const; + FASTDDS_EXPORTED_API CompleteAnnotationType& annotation_type(); - RTPS_DllAPI void struct_type( + FASTDDS_EXPORTED_API void struct_type( CompleteStructType _struct_type); - RTPS_DllAPI const CompleteStructType& struct_type() const; - RTPS_DllAPI CompleteStructType& struct_type(); + FASTDDS_EXPORTED_API const CompleteStructType& struct_type() const; + FASTDDS_EXPORTED_API CompleteStructType& struct_type(); - RTPS_DllAPI void union_type( + FASTDDS_EXPORTED_API void union_type( CompleteUnionType _union_type); - RTPS_DllAPI const CompleteUnionType& union_type() const; - RTPS_DllAPI CompleteUnionType& union_type(); + FASTDDS_EXPORTED_API const CompleteUnionType& union_type() const; + FASTDDS_EXPORTED_API CompleteUnionType& union_type(); - RTPS_DllAPI void bitset_type( + FASTDDS_EXPORTED_API void bitset_type( CompleteBitsetType _bitset_type); - RTPS_DllAPI const CompleteBitsetType& bitset_type() const; - RTPS_DllAPI CompleteBitsetType& bitset_type(); + FASTDDS_EXPORTED_API const CompleteBitsetType& bitset_type() const; + FASTDDS_EXPORTED_API CompleteBitsetType& bitset_type(); - RTPS_DllAPI void sequence_type( + FASTDDS_EXPORTED_API void sequence_type( CompleteSequenceType _sequence_type); - RTPS_DllAPI const CompleteSequenceType& sequence_type() const; - RTPS_DllAPI CompleteSequenceType& sequence_type(); + FASTDDS_EXPORTED_API const CompleteSequenceType& sequence_type() const; + FASTDDS_EXPORTED_API CompleteSequenceType& sequence_type(); - RTPS_DllAPI void array_type( + FASTDDS_EXPORTED_API void array_type( CompleteArrayType _array_type); - RTPS_DllAPI const CompleteArrayType& array_type() const; - RTPS_DllAPI CompleteArrayType& array_type(); + FASTDDS_EXPORTED_API const CompleteArrayType& array_type() const; + FASTDDS_EXPORTED_API CompleteArrayType& array_type(); - RTPS_DllAPI void map_type( + FASTDDS_EXPORTED_API void map_type( CompleteMapType _map_type); - RTPS_DllAPI const CompleteMapType& map_type() const; - RTPS_DllAPI CompleteMapType& map_type(); + FASTDDS_EXPORTED_API const CompleteMapType& map_type() const; + FASTDDS_EXPORTED_API CompleteMapType& map_type(); - RTPS_DllAPI void enumerated_type( + FASTDDS_EXPORTED_API void enumerated_type( CompleteEnumeratedType _enumerated_type); - RTPS_DllAPI const CompleteEnumeratedType& enumerated_type() const; - RTPS_DllAPI CompleteEnumeratedType& enumerated_type(); + FASTDDS_EXPORTED_API const CompleteEnumeratedType& enumerated_type() const; + FASTDDS_EXPORTED_API CompleteEnumeratedType& enumerated_type(); - RTPS_DllAPI void bitmask_type( + FASTDDS_EXPORTED_API void bitmask_type( CompleteBitmaskType _bitmask_type); - RTPS_DllAPI const CompleteBitmaskType& bitmask_type() const; - RTPS_DllAPI CompleteBitmaskType& bitmask_type(); + FASTDDS_EXPORTED_API const CompleteBitmaskType& bitmask_type() const; + FASTDDS_EXPORTED_API CompleteBitmaskType& bitmask_type(); - RTPS_DllAPI void extended_type( + FASTDDS_EXPORTED_API void extended_type( CompleteExtendedType _extended_type); - RTPS_DllAPI const CompleteExtendedType& extended_type() const; - RTPS_DllAPI CompleteExtendedType& extended_type(); + FASTDDS_EXPORTED_API const CompleteExtendedType& extended_type() const; + FASTDDS_EXPORTED_API CompleteExtendedType& extended_type(); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const CompleteTypeObject& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const CompleteTypeObject& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -6102,80 +6102,80 @@ class MinimalTypeObject final { public: - RTPS_DllAPI MinimalTypeObject(); - RTPS_DllAPI ~MinimalTypeObject(); - RTPS_DllAPI MinimalTypeObject( + FASTDDS_EXPORTED_API MinimalTypeObject(); + FASTDDS_EXPORTED_API ~MinimalTypeObject(); + FASTDDS_EXPORTED_API MinimalTypeObject( const MinimalTypeObject& x); - RTPS_DllAPI MinimalTypeObject( + FASTDDS_EXPORTED_API MinimalTypeObject( MinimalTypeObject&& x); - RTPS_DllAPI MinimalTypeObject& operator =( + FASTDDS_EXPORTED_API MinimalTypeObject& operator =( const MinimalTypeObject& x); - RTPS_DllAPI MinimalTypeObject& operator =( + FASTDDS_EXPORTED_API MinimalTypeObject& operator =( MinimalTypeObject&& x); - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( octet __d); - RTPS_DllAPI octet _d() const; - RTPS_DllAPI octet& _d(); + FASTDDS_EXPORTED_API octet _d() const; + FASTDDS_EXPORTED_API octet& _d(); - RTPS_DllAPI void alias_type( + FASTDDS_EXPORTED_API void alias_type( MinimalAliasType _alias_type); - RTPS_DllAPI const MinimalAliasType& alias_type() const; - RTPS_DllAPI MinimalAliasType& alias_type(); + FASTDDS_EXPORTED_API const MinimalAliasType& alias_type() const; + FASTDDS_EXPORTED_API MinimalAliasType& alias_type(); - RTPS_DllAPI void annotation_type( + FASTDDS_EXPORTED_API void annotation_type( MinimalAnnotationType _annotation_type); - RTPS_DllAPI const MinimalAnnotationType& annotation_type() const; - RTPS_DllAPI MinimalAnnotationType& annotation_type(); + FASTDDS_EXPORTED_API const MinimalAnnotationType& annotation_type() const; + FASTDDS_EXPORTED_API MinimalAnnotationType& annotation_type(); - RTPS_DllAPI void struct_type( + FASTDDS_EXPORTED_API void struct_type( MinimalStructType _struct_type); - RTPS_DllAPI const MinimalStructType& struct_type() const; - RTPS_DllAPI MinimalStructType& struct_type(); + FASTDDS_EXPORTED_API const MinimalStructType& struct_type() const; + FASTDDS_EXPORTED_API MinimalStructType& struct_type(); - RTPS_DllAPI void union_type( + FASTDDS_EXPORTED_API void union_type( MinimalUnionType _union_type); - RTPS_DllAPI const MinimalUnionType& union_type() const; - RTPS_DllAPI MinimalUnionType& union_type(); + FASTDDS_EXPORTED_API const MinimalUnionType& union_type() const; + FASTDDS_EXPORTED_API MinimalUnionType& union_type(); - RTPS_DllAPI void bitset_type( + FASTDDS_EXPORTED_API void bitset_type( MinimalBitsetType _bitset_type); - RTPS_DllAPI const MinimalBitsetType& bitset_type() const; - RTPS_DllAPI MinimalBitsetType& bitset_type(); + FASTDDS_EXPORTED_API const MinimalBitsetType& bitset_type() const; + FASTDDS_EXPORTED_API MinimalBitsetType& bitset_type(); - RTPS_DllAPI void sequence_type( + FASTDDS_EXPORTED_API void sequence_type( MinimalSequenceType _sequence_type); - RTPS_DllAPI const MinimalSequenceType& sequence_type() const; - RTPS_DllAPI MinimalSequenceType& sequence_type(); + FASTDDS_EXPORTED_API const MinimalSequenceType& sequence_type() const; + FASTDDS_EXPORTED_API MinimalSequenceType& sequence_type(); - RTPS_DllAPI void array_type( + FASTDDS_EXPORTED_API void array_type( MinimalArrayType _array_type); - RTPS_DllAPI const MinimalArrayType& array_type() const; - RTPS_DllAPI MinimalArrayType& array_type(); + FASTDDS_EXPORTED_API const MinimalArrayType& array_type() const; + FASTDDS_EXPORTED_API MinimalArrayType& array_type(); - RTPS_DllAPI void map_type( + FASTDDS_EXPORTED_API void map_type( MinimalMapType _map_type); - RTPS_DllAPI const MinimalMapType& map_type() const; - RTPS_DllAPI MinimalMapType& map_type(); + FASTDDS_EXPORTED_API const MinimalMapType& map_type() const; + FASTDDS_EXPORTED_API MinimalMapType& map_type(); - RTPS_DllAPI void enumerated_type( + FASTDDS_EXPORTED_API void enumerated_type( MinimalEnumeratedType _enumerated_type); - RTPS_DllAPI const MinimalEnumeratedType& enumerated_type() const; - RTPS_DllAPI MinimalEnumeratedType& enumerated_type(); + FASTDDS_EXPORTED_API const MinimalEnumeratedType& enumerated_type() const; + FASTDDS_EXPORTED_API MinimalEnumeratedType& enumerated_type(); - RTPS_DllAPI void bitmask_type( + FASTDDS_EXPORTED_API void bitmask_type( MinimalBitmaskType _bitmask_type); - RTPS_DllAPI const MinimalBitmaskType& bitmask_type() const; - RTPS_DllAPI MinimalBitmaskType& bitmask_type(); + FASTDDS_EXPORTED_API const MinimalBitmaskType& bitmask_type() const; + FASTDDS_EXPORTED_API MinimalBitmaskType& bitmask_type(); - RTPS_DllAPI void extended_type( + FASTDDS_EXPORTED_API void extended_type( MinimalExtendedType _extended_type); - RTPS_DllAPI const MinimalExtendedType& extended_type() const; - RTPS_DllAPI MinimalExtendedType& extended_type(); + FASTDDS_EXPORTED_API const MinimalExtendedType& extended_type() const; + FASTDDS_EXPORTED_API MinimalExtendedType& extended_type(); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const MinimalTypeObject& other) const; - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const MinimalTypeObject& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -6202,39 +6202,39 @@ class TypeObject /*! * @brief Default constructor. */ - RTPS_DllAPI TypeObject(); + FASTDDS_EXPORTED_API TypeObject(); /*! * @brief Default destructor. */ - RTPS_DllAPI ~TypeObject(); + FASTDDS_EXPORTED_API ~TypeObject(); /*! * @brief Copy constructor. * @param x Reference to the object TypeObject that will be copied. */ - RTPS_DllAPI TypeObject( + FASTDDS_EXPORTED_API TypeObject( const TypeObject& x); /*! * @brief Move constructor. * @param x Reference to the object TypeObject that will be copied. */ - RTPS_DllAPI TypeObject( + FASTDDS_EXPORTED_API TypeObject( TypeObject&& x); /*! * @brief Copy assignment. * @param x Reference to the object TypeObject that will be copied. */ - RTPS_DllAPI TypeObject& operator =( + FASTDDS_EXPORTED_API TypeObject& operator =( const TypeObject& x); /*! * @brief Move assignment. * @param x Reference to the object TypeObject that will be copied. */ - RTPS_DllAPI TypeObject& operator =( + FASTDDS_EXPORTED_API TypeObject& operator =( TypeObject&& x); /*! @@ -6242,33 +6242,33 @@ class TypeObject * @param __d New value for the discriminator. * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member. */ - RTPS_DllAPI void _d( + FASTDDS_EXPORTED_API void _d( uint8_t __d); /*! * @brief This function returns the value of the discriminator. * @return Value of the discriminator */ - RTPS_DllAPI uint8_t _d() const; + FASTDDS_EXPORTED_API uint8_t _d() const; /*! * @brief This function returns a reference to the discriminator. * @return Reference to the discriminator. */ - RTPS_DllAPI uint8_t& _d(); + FASTDDS_EXPORTED_API uint8_t& _d(); /*! * @brief This function copies the value in member complete * @param _complete New value to be copied in member complete */ - RTPS_DllAPI void complete( + FASTDDS_EXPORTED_API void complete( const CompleteTypeObject& _complete); /*! * @brief This function moves the value in member complete * @param _complete New value to be moved in member complete */ - RTPS_DllAPI void complete( + FASTDDS_EXPORTED_API void complete( CompleteTypeObject&& _complete); /*! @@ -6276,26 +6276,26 @@ class TypeObject * @return Constant reference to member complete * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const CompleteTypeObject& complete() const; + FASTDDS_EXPORTED_API const CompleteTypeObject& complete() const; /*! * @brief This function returns a reference to member complete * @return Reference to member complete * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI CompleteTypeObject& complete(); + FASTDDS_EXPORTED_API CompleteTypeObject& complete(); /*! * @brief This function copies the value in member minimal * @param _minimal New value to be copied in member minimal */ - RTPS_DllAPI void minimal( + FASTDDS_EXPORTED_API void minimal( const MinimalTypeObject& _minimal); /*! * @brief This function moves the value in member minimal * @param _minimal New value to be moved in member minimal */ - RTPS_DllAPI void minimal( + FASTDDS_EXPORTED_API void minimal( MinimalTypeObject&& _minimal); /*! @@ -6303,16 +6303,16 @@ class TypeObject * @return Constant reference to member minimal * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI const MinimalTypeObject& minimal() const; + FASTDDS_EXPORTED_API const MinimalTypeObject& minimal() const; /*! * @brief This function returns a reference to member minimal * @return Reference to member minimal * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection. */ - RTPS_DllAPI MinimalTypeObject& minimal(); + FASTDDS_EXPORTED_API MinimalTypeObject& minimal(); - RTPS_DllAPI bool operator ==( + FASTDDS_EXPORTED_API bool operator ==( const TypeObject& other) const; /*! @@ -6320,7 +6320,7 @@ class TypeObject * @param x TypeObject to check if can be assigned to the current instance. * @param consistency fastdds::dds::TypeConsistencyEnforcementQoSPolicy to apply. */ - RTPS_DllAPI bool consistent( + FASTDDS_EXPORTED_API bool consistent( const TypeObject& x, const fastdds::dds::TypeConsistencyEnforcementQosPolicy& consistency) const; @@ -6348,57 +6348,57 @@ class TypeIdentifierTypeObjectPair final { public: - RTPS_DllAPI TypeIdentifierTypeObjectPair(); - RTPS_DllAPI ~TypeIdentifierTypeObjectPair(); - RTPS_DllAPI TypeIdentifierTypeObjectPair( + FASTDDS_EXPORTED_API TypeIdentifierTypeObjectPair(); + FASTDDS_EXPORTED_API ~TypeIdentifierTypeObjectPair(); + FASTDDS_EXPORTED_API TypeIdentifierTypeObjectPair( const TypeIdentifierTypeObjectPair& x); - RTPS_DllAPI TypeIdentifierTypeObjectPair( + FASTDDS_EXPORTED_API TypeIdentifierTypeObjectPair( TypeIdentifierTypeObjectPair&& x); - RTPS_DllAPI TypeIdentifierTypeObjectPair& operator =( + FASTDDS_EXPORTED_API TypeIdentifierTypeObjectPair& operator =( const TypeIdentifierTypeObjectPair& x); - RTPS_DllAPI TypeIdentifierTypeObjectPair& operator =( + FASTDDS_EXPORTED_API TypeIdentifierTypeObjectPair& operator =( TypeIdentifierTypeObjectPair&& x); - RTPS_DllAPI inline void type_identifier( + FASTDDS_EXPORTED_API inline void type_identifier( const TypeIdentifier& _type_identifier) { m_type_identifier = _type_identifier; } - RTPS_DllAPI inline void type_identifier( + FASTDDS_EXPORTED_API inline void type_identifier( TypeIdentifier&& _type_identifier) { m_type_identifier = std::move(_type_identifier); } - RTPS_DllAPI inline const TypeIdentifier& type_identifier() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_identifier() const { return m_type_identifier; } - RTPS_DllAPI inline TypeIdentifier& type_identifier() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_identifier() { return m_type_identifier; } - RTPS_DllAPI inline void type_object( + FASTDDS_EXPORTED_API inline void type_object( const TypeObject& _type_object) { m_type_object = _type_object; } - RTPS_DllAPI inline void type_object( + FASTDDS_EXPORTED_API inline void type_object( TypeObject&& _type_object) { m_type_object = std::move(_type_object); } - RTPS_DllAPI inline const TypeObject& type_object() const + FASTDDS_EXPORTED_API inline const TypeObject& type_object() const { return m_type_object; } - RTPS_DllAPI inline TypeObject& type_object() + FASTDDS_EXPORTED_API inline TypeObject& type_object() { return m_type_object; } @@ -6418,57 +6418,57 @@ class TypeIdentifierPair final { public: - RTPS_DllAPI TypeIdentifierPair(); - RTPS_DllAPI ~TypeIdentifierPair(); - RTPS_DllAPI TypeIdentifierPair( + FASTDDS_EXPORTED_API TypeIdentifierPair(); + FASTDDS_EXPORTED_API ~TypeIdentifierPair(); + FASTDDS_EXPORTED_API TypeIdentifierPair( const TypeIdentifierPair& x); - RTPS_DllAPI TypeIdentifierPair( + FASTDDS_EXPORTED_API TypeIdentifierPair( TypeIdentifierPair&& x); - RTPS_DllAPI TypeIdentifierPair& operator =( + FASTDDS_EXPORTED_API TypeIdentifierPair& operator =( const TypeIdentifierPair& x); - RTPS_DllAPI TypeIdentifierPair& operator =( + FASTDDS_EXPORTED_API TypeIdentifierPair& operator =( TypeIdentifierPair&& x); - RTPS_DllAPI inline void type_identifier1( + FASTDDS_EXPORTED_API inline void type_identifier1( const TypeIdentifier& _type_identifier1) { m_type_identifier1 = _type_identifier1; } - RTPS_DllAPI inline void type_identifier1( + FASTDDS_EXPORTED_API inline void type_identifier1( TypeIdentifier&& _type_identifier1) { m_type_identifier1 = std::move(_type_identifier1); } - RTPS_DllAPI inline const TypeIdentifier& type_identifier1() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_identifier1() const { return m_type_identifier1; } - RTPS_DllAPI inline TypeIdentifier& type_identifier1() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_identifier1() { return m_type_identifier1; } - RTPS_DllAPI inline void type_identifier2( + FASTDDS_EXPORTED_API inline void type_identifier2( const TypeIdentifier& _type_identifier2) { m_type_identifier2 = _type_identifier2; } - RTPS_DllAPI inline void type_identifier2( + FASTDDS_EXPORTED_API inline void type_identifier2( TypeIdentifier&& _type_identifier2) { m_type_identifier2 = std::move(_type_identifier2); } - RTPS_DllAPI inline const TypeIdentifier& type_identifier2() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_identifier2() const { return m_type_identifier2; } - RTPS_DllAPI inline TypeIdentifier& type_identifier2() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_identifier2() { return m_type_identifier2; } @@ -6488,57 +6488,57 @@ class TypeIdentifierWithSize { public: - RTPS_DllAPI TypeIdentifierWithSize(); - RTPS_DllAPI ~TypeIdentifierWithSize(); - RTPS_DllAPI TypeIdentifierWithSize( + FASTDDS_EXPORTED_API TypeIdentifierWithSize(); + FASTDDS_EXPORTED_API ~TypeIdentifierWithSize(); + FASTDDS_EXPORTED_API TypeIdentifierWithSize( const TypeIdentifierWithSize& x); - RTPS_DllAPI TypeIdentifierWithSize( + FASTDDS_EXPORTED_API TypeIdentifierWithSize( TypeIdentifierWithSize&& x); - RTPS_DllAPI TypeIdentifierWithSize& operator =( + FASTDDS_EXPORTED_API TypeIdentifierWithSize& operator =( const TypeIdentifierWithSize& x); - RTPS_DllAPI TypeIdentifierWithSize& operator =( + FASTDDS_EXPORTED_API TypeIdentifierWithSize& operator =( TypeIdentifierWithSize&& x); - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( const TypeIdentifier& _type_id) { m_type_id = _type_id; } - RTPS_DllAPI inline void type_id( + FASTDDS_EXPORTED_API inline void type_id( TypeIdentifier&& _type_id) { m_type_id = std::move(_type_id); } - RTPS_DllAPI inline const TypeIdentifier& type_id() const + FASTDDS_EXPORTED_API inline const TypeIdentifier& type_id() const { return m_type_id; } - RTPS_DllAPI inline TypeIdentifier& type_id() + FASTDDS_EXPORTED_API inline TypeIdentifier& type_id() { return m_type_id; } - RTPS_DllAPI inline void typeobject_serialized_size( + FASTDDS_EXPORTED_API inline void typeobject_serialized_size( const uint32_t& _typeobject_serialized_size) { m_typeobject_serialized_size = _typeobject_serialized_size; } - RTPS_DllAPI inline void typeobject_serialized_size( + FASTDDS_EXPORTED_API inline void typeobject_serialized_size( uint32_t&& _typeobject_serialized_size) { m_typeobject_serialized_size = std::move(_typeobject_serialized_size); } - RTPS_DllAPI inline const uint32_t& typeobject_serialized_size() const + FASTDDS_EXPORTED_API inline const uint32_t& typeobject_serialized_size() const { return m_typeobject_serialized_size; } - RTPS_DllAPI inline uint32_t& typeobject_serialized_size() + FASTDDS_EXPORTED_API inline uint32_t& typeobject_serialized_size() { return m_typeobject_serialized_size; } @@ -6561,79 +6561,79 @@ class TypeIdentifierWithDependencies { public: - RTPS_DllAPI TypeIdentifierWithDependencies(); - RTPS_DllAPI ~TypeIdentifierWithDependencies(); - RTPS_DllAPI TypeIdentifierWithDependencies( + FASTDDS_EXPORTED_API TypeIdentifierWithDependencies(); + FASTDDS_EXPORTED_API ~TypeIdentifierWithDependencies(); + FASTDDS_EXPORTED_API TypeIdentifierWithDependencies( const TypeIdentifierWithDependencies& x); - RTPS_DllAPI TypeIdentifierWithDependencies( + FASTDDS_EXPORTED_API TypeIdentifierWithDependencies( TypeIdentifierWithDependencies&& x); - RTPS_DllAPI TypeIdentifierWithDependencies& operator =( + FASTDDS_EXPORTED_API TypeIdentifierWithDependencies& operator =( const TypeIdentifierWithDependencies& x); - RTPS_DllAPI TypeIdentifierWithDependencies& operator =( + FASTDDS_EXPORTED_API TypeIdentifierWithDependencies& operator =( TypeIdentifierWithDependencies&& x); - RTPS_DllAPI inline void typeid_with_size( + FASTDDS_EXPORTED_API inline void typeid_with_size( const TypeIdentifierWithSize& _typeid_with_size) { m_typeid_with_size = _typeid_with_size; } - RTPS_DllAPI inline void typeid_with_size( + FASTDDS_EXPORTED_API inline void typeid_with_size( TypeIdentifierWithSize&& _typeid_with_size) { m_typeid_with_size = std::move(_typeid_with_size); } - RTPS_DllAPI inline const TypeIdentifierWithSize& typeid_with_size() const + FASTDDS_EXPORTED_API inline const TypeIdentifierWithSize& typeid_with_size() const { return m_typeid_with_size; } - RTPS_DllAPI inline TypeIdentifierWithSize& typeid_with_size() + FASTDDS_EXPORTED_API inline TypeIdentifierWithSize& typeid_with_size() { return m_typeid_with_size; } - RTPS_DllAPI inline void dependent_typeid_count( + FASTDDS_EXPORTED_API inline void dependent_typeid_count( const int32_t& _dependent_typeid_count) { m_dependent_typeid_count = _dependent_typeid_count; } - RTPS_DllAPI inline void dependent_typeid_count( + FASTDDS_EXPORTED_API inline void dependent_typeid_count( int32_t&& _dependent_typeid_count) { m_dependent_typeid_count = std::move(_dependent_typeid_count); } - RTPS_DllAPI inline const int32_t& dependent_typeid_count() const + FASTDDS_EXPORTED_API inline const int32_t& dependent_typeid_count() const { return m_dependent_typeid_count; } - RTPS_DllAPI inline int32_t& dependent_typeid_count() + FASTDDS_EXPORTED_API inline int32_t& dependent_typeid_count() { return m_dependent_typeid_count; } - RTPS_DllAPI inline void dependent_typeids( + FASTDDS_EXPORTED_API inline void dependent_typeids( const TypeIdentifierWithSizeSeq& _dependent_typeids) { m_dependent_typeids = _dependent_typeids; } - RTPS_DllAPI inline void dependent_typeids( + FASTDDS_EXPORTED_API inline void dependent_typeids( TypeIdentifierWithSizeSeq&& _dependent_typeids) { m_dependent_typeids = std::move(_dependent_typeids); } - RTPS_DllAPI inline const TypeIdentifierWithSizeSeq& dependent_typeids() const + FASTDDS_EXPORTED_API inline const TypeIdentifierWithSizeSeq& dependent_typeids() const { return m_dependent_typeids; } - RTPS_DllAPI inline TypeIdentifierWithSizeSeq& dependent_typeids() + FASTDDS_EXPORTED_API inline TypeIdentifierWithSizeSeq& dependent_typeids() { return m_dependent_typeids; } @@ -6659,57 +6659,57 @@ class TypeInformation { public: - RTPS_DllAPI TypeInformation(); - RTPS_DllAPI ~TypeInformation(); - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation(); + FASTDDS_EXPORTED_API ~TypeInformation(); + FASTDDS_EXPORTED_API TypeInformation( const TypeInformation& x); - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( TypeInformation&& x); - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( const TypeInformation& x); - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( TypeInformation&& x); - RTPS_DllAPI inline void minimal( + FASTDDS_EXPORTED_API inline void minimal( const TypeIdentifierWithDependencies& _minimal) { m_minimal = _minimal; } - RTPS_DllAPI inline void minimal( + FASTDDS_EXPORTED_API inline void minimal( TypeIdentifierWithDependencies&& _minimal) { m_minimal = std::move(_minimal); } - RTPS_DllAPI inline const TypeIdentifierWithDependencies& minimal() const + FASTDDS_EXPORTED_API inline const TypeIdentifierWithDependencies& minimal() const { return m_minimal; } - RTPS_DllAPI inline TypeIdentifierWithDependencies& minimal() + FASTDDS_EXPORTED_API inline TypeIdentifierWithDependencies& minimal() { return m_minimal; } - RTPS_DllAPI inline void complete( + FASTDDS_EXPORTED_API inline void complete( const TypeIdentifierWithDependencies& _complete) { m_complete = _complete; } - RTPS_DllAPI inline void complete( + FASTDDS_EXPORTED_API inline void complete( TypeIdentifierWithDependencies&& _complete) { m_complete = std::move(_complete); } - RTPS_DllAPI inline const TypeIdentifierWithDependencies& complete() const + FASTDDS_EXPORTED_API inline const TypeIdentifierWithDependencies& complete() const { return m_complete; } - RTPS_DllAPI inline TypeIdentifierWithDependencies& complete() + FASTDDS_EXPORTED_API inline TypeIdentifierWithDependencies& complete() { return m_complete; } diff --git a/include/fastrtps/types/TypeObjectFactory.h b/include/fastrtps/types/TypeObjectFactory.h index 33fd87ba9c4..4d935923df4 100644 --- a/include/fastrtps/types/TypeObjectFactory.h +++ b/include/fastrtps/types/TypeObjectFactory.h @@ -28,11 +28,13 @@ namespace types { class TypeObjectFactory { private: + mutable std::recursive_mutex m_MutexIdentifiers; mutable std::recursive_mutex m_MutexObjects; mutable std::recursive_mutex m_MutexInformations; protected: + TypeObjectFactory(); mutable std::map identifiers_; // Basic, builtin and EK_MINIMAL std::map complete_identifiers_; // Only EK_COMPLETE @@ -122,9 +124,10 @@ class TypeObjectFactory const TypeIdentifier* identifier) const; public: - RTPS_DllAPI static TypeObjectFactory* get_instance(); - RTPS_DllAPI static ReturnCode_t delete_instance(); + FASTDDS_EXPORTED_API static TypeObjectFactory* get_instance(); + + FASTDDS_EXPORTED_API static ReturnCode_t delete_instance(); ~TypeObjectFactory(); @@ -133,81 +136,81 @@ class TypeObjectFactory * @param type_name * @return */ - RTPS_DllAPI const TypeInformation* get_type_information( - const std::string &type_name) const; + FASTDDS_EXPORTED_API const TypeInformation* get_type_information( + const std::string& type_name) const; /** * @brief get_type_information Retrieves the TypeInformation of the given TypeIdentifier. * @param identifier * @return */ - RTPS_DllAPI TypeInformation* get_type_information( + FASTDDS_EXPORTED_API TypeInformation* get_type_information( const TypeIdentifier* identifier) const; - RTPS_DllAPI const TypeObject* get_type_object( + FASTDDS_EXPORTED_API const TypeObject* get_type_object( const std::string& type_name, bool complete = false) const; - RTPS_DllAPI const TypeObject* get_type_object( + FASTDDS_EXPORTED_API const TypeObject* get_type_object( const TypeIdentifier* identifier) const; - RTPS_DllAPI TypeKind get_type_kind( + FASTDDS_EXPORTED_API TypeKind get_type_kind( const std::string& type_name) const; - RTPS_DllAPI std::string get_type_name( + FASTDDS_EXPORTED_API std::string get_type_name( const TypeKind kind) const; - RTPS_DllAPI std::string get_type_name( + FASTDDS_EXPORTED_API std::string get_type_name( const TypeIdentifier* identifier) const; - RTPS_DllAPI const TypeIdentifier* get_primitive_type_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_primitive_type_identifier( TypeKind kind) const; - RTPS_DllAPI const TypeIdentifier* get_type_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_type_identifier( const std::string& type_name, bool complete = false) const; - RTPS_DllAPI const TypeIdentifier* get_type_identifier_trying_complete( + FASTDDS_EXPORTED_API const TypeIdentifier* get_type_identifier_trying_complete( const std::string& type_name) const; - RTPS_DllAPI const TypeIdentifier* get_string_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_string_identifier( uint32_t bound, bool wide = false); - RTPS_DllAPI const TypeIdentifier* get_sequence_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_sequence_identifier( const std::string& type_name, uint32_t bound, bool complete = false); - RTPS_DllAPI const TypeIdentifier* get_array_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_array_identifier( const std::string& type_name, - const std::vector &bound, + const std::vector& bound, bool complete = false); - RTPS_DllAPI const TypeIdentifier* get_map_identifier( + FASTDDS_EXPORTED_API const TypeIdentifier* get_map_identifier( const std::string& key_type_name, const std::string& value_type_name, uint32_t bound, bool complete = false); - RTPS_DllAPI DynamicType_ptr build_dynamic_type( + FASTDDS_EXPORTED_API DynamicType_ptr build_dynamic_type( const std::string& name, const TypeIdentifier* identifier, const TypeObject* object = nullptr) const; - RTPS_DllAPI bool is_type_identifier_complete( + FASTDDS_EXPORTED_API bool is_type_identifier_complete( const TypeIdentifier* identifier) const; - RTPS_DllAPI void add_type_identifier( + FASTDDS_EXPORTED_API void add_type_identifier( const std::string& type_name, const TypeIdentifier* identifier); - RTPS_DllAPI void add_type_object( + FASTDDS_EXPORTED_API void add_type_object( const std::string& type_name, const TypeIdentifier* identifier, const TypeObject* object); - RTPS_DllAPI inline void add_alias( + FASTDDS_EXPORTED_API inline void add_alias( const std::string& alias_name, const std::string& target_type) { @@ -225,7 +228,7 @@ class TypeObjectFactory * @param max_size * @return */ - RTPS_DllAPI TypeIdentifierWithSizeSeq typelookup_get_type_dependencies( + FASTDDS_EXPORTED_API TypeIdentifierWithSizeSeq typelookup_get_type_dependencies( const TypeIdentifierSeq& identifiers, const OctetSeq& in_continuation_point, OctetSeq& out_continuation_point, @@ -239,7 +242,7 @@ class TypeObjectFactory * @param object * @return */ - RTPS_DllAPI const TypeIdentifier* typelookup_get_type( + FASTDDS_EXPORTED_API const TypeIdentifier* typelookup_get_type( const TypeIdentifier& identifier, TypeObject& object) const; @@ -248,7 +251,7 @@ class TypeObjectFactory * @param identifier * @return */ - RTPS_DllAPI bool typelookup_check_type_identifier( + FASTDDS_EXPORTED_API bool typelookup_check_type_identifier( const TypeIdentifier& identifier) const; /** @@ -263,7 +266,7 @@ class TypeObjectFactory * @param information * @return */ - RTPS_DllAPI const TypeObject* typelookup_get_type_object_from_information( + FASTDDS_EXPORTED_API const TypeObject* typelookup_get_type_object_from_information( const TypeInformation& information) const; }; diff --git a/include/fastrtps/types/TypesBase.h b/include/fastrtps/types/TypesBase.h index c5242e17ad6..7d5a51f5bd1 100644 --- a/include/fastrtps/types/TypesBase.h +++ b/include/fastrtps/types/TypesBase.h @@ -186,7 +186,7 @@ const uint16_t MemberFlagMinimalMask = 0x003f; * @brief This class represents the enumeration ReturnCode_t. */ -class RTPS_DllAPI ReturnCode_t +class FASTDDS_EXPORTED_API ReturnCode_t { uint32_t value_; @@ -247,7 +247,7 @@ class RTPS_DllAPI ReturnCode_t }; -RTPS_DllAPI inline bool operator ==( +FASTDDS_EXPORTED_API inline bool operator ==( ReturnCode_t::ReturnCodeValue a, const ReturnCode_t& b) { @@ -255,7 +255,7 @@ RTPS_DllAPI inline bool operator ==( a); } -RTPS_DllAPI inline bool operator !=( +FASTDDS_EXPORTED_API inline bool operator !=( ReturnCode_t::ReturnCodeValue a, const ReturnCode_t& b) { @@ -263,7 +263,7 @@ RTPS_DllAPI inline bool operator !=( a); } -RTPS_DllAPI inline bool operator ==( +FASTDDS_EXPORTED_API inline bool operator ==( uint32_t a, const ReturnCode_t& b) { @@ -271,7 +271,7 @@ RTPS_DllAPI inline bool operator ==( a); } -RTPS_DllAPI inline bool operator !=( +FASTDDS_EXPORTED_API inline bool operator !=( uint32_t a, const ReturnCode_t& b) { diff --git a/include/fastrtps/utils/IPFinder.h b/include/fastrtps/utils/IPFinder.h index 116e87e57fd..1babd66fd4d 100644 --- a/include/fastrtps/utils/IPFinder.h +++ b/include/fastrtps/utils/IPFinder.h @@ -80,7 +80,7 @@ class IPFinder IPFinder(); virtual ~IPFinder(); - RTPS_DllAPI static bool getIPs( + FASTDDS_EXPORTED_API static bool getIPs( std::vector* vec_name, bool return_loopback = false); @@ -88,36 +88,36 @@ class IPFinder * Get the IP4Adresses in all interfaces. * @param[out] locators List of locators to be populated with the IP4 addresses. */ - RTPS_DllAPI static bool getIP4Address( + FASTDDS_EXPORTED_API static bool getIP4Address( LocatorList_t* locators); /** * Get the IP6Adresses in all interfaces. * @param[out] locators List of locators to be populated with the IP6 addresses. */ - RTPS_DllAPI static bool getIP6Address( + FASTDDS_EXPORTED_API static bool getIP6Address( LocatorList_t* locators); /** * Get all IP Adresses in all interfaces. * @param[out] locators List of locators to be populated with the addresses. */ - RTPS_DllAPI static bool getAllIPAddress( + FASTDDS_EXPORTED_API static bool getAllIPAddress( LocatorList_t* locators); /** * Parses an IP4 string, populating a info_IP with its value. * @param[out] info info_IP to populate. * */ - RTPS_DllAPI static bool parseIP4( + FASTDDS_EXPORTED_API static bool parseIP4( info_IP& info); /** * Parses an IP6 string, populating a info_IP with its value. * @param[out] info info_IP to populate. * */ - RTPS_DllAPI static bool parseIP6( + FASTDDS_EXPORTED_API static bool parseIP6( info_IP& info); - RTPS_DllAPI static std::string getIPv4Address( + FASTDDS_EXPORTED_API static std::string getIPv4Address( const std::string& name); - RTPS_DllAPI static std::string getIPv6Address( + FASTDDS_EXPORTED_API static std::string getIPv6Address( const std::string& name); /** @@ -125,7 +125,7 @@ class IPFinder * Will return all unique MAC addresses for eadh of the interfaces returned by getAllIPAddress * @param[out] macs List of MAC addresses. */ - RTPS_DllAPI static bool getAllMACAddress( + FASTDDS_EXPORTED_API static bool getAllMACAddress( std::vector* macs); }; diff --git a/include/fastrtps/utils/IPLocator.h b/include/fastrtps/utils/IPLocator.h index 656da36f3e7..d2df1cde930 100644 --- a/include/fastrtps/utils/IPLocator.h +++ b/include/fastrtps/utils/IPLocator.h @@ -49,19 +49,19 @@ class IPLocator * @param portin Port of the locator. * @param locator Locator to be filled. */ - RTPS_DllAPI static void createLocator( + FASTDDS_EXPORTED_API static void createLocator( int32_t kindin, const std::string& address, uint32_t portin, Locator_t& locator); //! Sets locator's IPv4. - RTPS_DllAPI static bool setIPv4( + FASTDDS_EXPORTED_API static bool setIPv4( Locator_t& locator, const unsigned char* addr); //! Sets locator's IPv4. - RTPS_DllAPI static bool setIPv4( + FASTDDS_EXPORTED_API static bool setIPv4( Locator_t& locator, octet o1, octet o2, @@ -69,47 +69,47 @@ class IPLocator octet o4); //! Sets locator's IPv4. - RTPS_DllAPI static bool setIPv4( + FASTDDS_EXPORTED_API static bool setIPv4( Locator_t& locator, const std::string& ipv4); //! Copies locator's IPv4. - RTPS_DllAPI static bool setIPv4( + FASTDDS_EXPORTED_API static bool setIPv4( Locator_t& destlocator, const Locator_t& origlocator); //! Copies locator's IPv4. - RTPS_DllAPI static bool setIPv4address( + FASTDDS_EXPORTED_API static bool setIPv4address( Locator_t& destlocator, const std::string& lan, const std::string& wan, const std::string& ipv4); //! Retrieves locator's IPv4 as octet array. - RTPS_DllAPI static const octet* getIPv4( + FASTDDS_EXPORTED_API static const octet* getIPv4( const Locator_t& locator); //! Check if the locator has IPv4. - RTPS_DllAPI static bool hasIPv4( + FASTDDS_EXPORTED_API static bool hasIPv4( const Locator_t& locator); //! Returns a string representation of the locator's IPv4. - RTPS_DllAPI static std::string toIPv4string( + FASTDDS_EXPORTED_API static std::string toIPv4string( const Locator_t& locator); //! Copies locator's IPv4. - RTPS_DllAPI static bool copyIPv4( + FASTDDS_EXPORTED_API static bool copyIPv4( const Locator_t& locator, unsigned char* dest); // IPv6 //! Sets locator's IPv6. - RTPS_DllAPI static bool setIPv6( + FASTDDS_EXPORTED_API static bool setIPv6( Locator_t& locator, const unsigned char* addr); //! Sets locator's IPv6. - RTPS_DllAPI static bool setIPv6( + FASTDDS_EXPORTED_API static bool setIPv6( Locator_t& locator, uint16_t group0, uint16_t group1, @@ -121,63 +121,63 @@ class IPLocator uint16_t group7); //! Sets locator's IPv6. - RTPS_DllAPI static bool setIPv6( + FASTDDS_EXPORTED_API static bool setIPv6( Locator_t& locator, const std::string& ipv6); //! Copies locator's IPv6. - RTPS_DllAPI static bool setIPv6( + FASTDDS_EXPORTED_API static bool setIPv6( Locator_t& destlocator, const Locator_t& origlocator); //! Retrieves locator's IPv6 as octet array. - RTPS_DllAPI static const octet* getIPv6( + FASTDDS_EXPORTED_API static const octet* getIPv6( const Locator_t& locator); //! Check if the locator has IPv6. - RTPS_DllAPI static bool hasIPv6( + FASTDDS_EXPORTED_API static bool hasIPv6( const Locator_t& locator); //! Returns a string representation of the locator's IPv6 following RFC 5952 recommendation. - RTPS_DllAPI static std::string toIPv6string( + FASTDDS_EXPORTED_API static std::string toIPv6string( const Locator_t& locator); //! Copies locator's IPv6. - RTPS_DllAPI static bool copyIPv6( + FASTDDS_EXPORTED_API static bool copyIPv6( const Locator_t& locator, unsigned char* dest); //! Sets locator's IP - RTPS_DllAPI static bool ip( + FASTDDS_EXPORTED_API static bool ip( Locator_t& locator, const std::string& ip); //! Returns a string representation of the locator's IP. - RTPS_DllAPI static std::string ip_to_string( + FASTDDS_EXPORTED_API static std::string ip_to_string( const Locator_t& locator); // TCP //! Sets locator's logical port (as in RTCP protocol) - RTPS_DllAPI static bool setLogicalPort( + FASTDDS_EXPORTED_API static bool setLogicalPort( Locator_t& locator, uint16_t port); //! Gets locator's logical port (as in RTCP protocol) - RTPS_DllAPI static uint16_t getLogicalPort( + FASTDDS_EXPORTED_API static uint16_t getLogicalPort( const Locator_t& locator); //! Sets locator's physical port (as in RTCP protocol) - RTPS_DllAPI static bool setPhysicalPort( + FASTDDS_EXPORTED_API static bool setPhysicalPort( Locator_t& locator, uint16_t port); //! Gets locator's physical port (as in RTCP protocol) - RTPS_DllAPI static uint16_t getPhysicalPort( + FASTDDS_EXPORTED_API static uint16_t getPhysicalPort( const Locator_t& locator); // TCPv4 //! Sets locator's WAN address (as in RTCP protocol) - RTPS_DllAPI static bool setWan( + FASTDDS_EXPORTED_API static bool setWan( Locator_t& locator, octet o1, octet o2, @@ -185,96 +185,96 @@ class IPLocator octet o4); //! Sets locator's WAN address (as in RTCP protocol) - RTPS_DllAPI static bool setWan( + FASTDDS_EXPORTED_API static bool setWan( Locator_t& locator, const std::string& wan); //! Gets locator's WAN address (as in RTCP protocol) - RTPS_DllAPI static const octet* getWan( + FASTDDS_EXPORTED_API static const octet* getWan( const Locator_t& locator); //! Checks if the locator has WAN address (as in RTCP protocol) - RTPS_DllAPI static bool hasWan( + FASTDDS_EXPORTED_API static bool hasWan( const Locator_t& locator); //! Retrieves a string representation of the locator's WAN address (as in RTCP protocol) - RTPS_DllAPI static std::string toWanstring( + FASTDDS_EXPORTED_API static std::string toWanstring( const Locator_t& locator); //! This method is useful in the case of having a tcp client with an initial peer //! pointing to a WAN locator, and receiving a locator with LAN and WAN //! addresses (TCP Client from TCP Server) - RTPS_DllAPI static Locator_t WanToLanLocator( + FASTDDS_EXPORTED_API static Locator_t WanToLanLocator( const Locator_t& locator); //! Sets locator's LAN ID (as in RTCP protocol) - RTPS_DllAPI static bool setLanID( + FASTDDS_EXPORTED_API static bool setLanID( Locator_t& locator, const std::string& lanId); //! Gets locator's LAN ID (as in RTCP protocol) - RTPS_DllAPI static const octet* getLanID( + FASTDDS_EXPORTED_API static const octet* getLanID( const Locator_t& locator); //! Retrieves a string representation of the locator's LAN ID (as in RTCP protocol) - RTPS_DllAPI static std::string toLanIDstring( + FASTDDS_EXPORTED_API static std::string toLanIDstring( const Locator_t& locator); //! Returns a new locator without logical port (as in RTCP protocol). - RTPS_DllAPI static Locator_t toPhysicalLocator( + FASTDDS_EXPORTED_API static Locator_t toPhysicalLocator( const Locator_t& locator); //! Checks if a locator WAN address and IP address are the same (as in RTCP protocol). - RTPS_DllAPI static bool ip_equals_wan( + FASTDDS_EXPORTED_API static bool ip_equals_wan( const Locator_t& locator); // Common //! Sets locator's RTCP port. Physical for UDP and logical for TCP (as in RTCP protocol) - RTPS_DllAPI static bool setPortRTPS( + FASTDDS_EXPORTED_API static bool setPortRTPS( Locator_t& locator, uint16_t port); //! Gets locator's RTCP port. Physical for UDP and logical for TCP (as in RTCP protocol) - RTPS_DllAPI static uint16_t getPortRTPS( + FASTDDS_EXPORTED_API static uint16_t getPortRTPS( Locator_t& locator); //! Checks if a locator has local IP address. - RTPS_DllAPI static bool isLocal( + FASTDDS_EXPORTED_API static bool isLocal( const Locator_t& locator); //! Checks if a locator has any IP address. - RTPS_DllAPI static bool isAny( + FASTDDS_EXPORTED_API static bool isAny( const Locator_t& locator); //! Checks if both locators has the same IP address. - RTPS_DllAPI static bool compareAddress( + FASTDDS_EXPORTED_API static bool compareAddress( const Locator_t& loc1, const Locator_t& loc2, bool fullAddress = false); //! Checks if a both locators has the same IP address and physical port (as in RTCP protocol). - RTPS_DllAPI static bool compareAddressAndPhysicalPort( + FASTDDS_EXPORTED_API static bool compareAddressAndPhysicalPort( const Locator_t& loc1, const Locator_t& loc2); //! Returns a string representation of the given locator. - RTPS_DllAPI static std::string to_string( + FASTDDS_EXPORTED_API static std::string to_string( const Locator_t& locator); // UDP //! Checks if the locator has a multicast IP address. - RTPS_DllAPI static bool isMulticast( + FASTDDS_EXPORTED_API static bool isMulticast( const Locator_t& locator); //! Resolve an address name by a DNS request and return the IP that this address references by a DNS server - RTPS_DllAPI static std::pair, std::set> resolveNameDNS( + FASTDDS_EXPORTED_API static std::pair, std::set> resolveNameDNS( const std::string& address_name); //! Check whether a string contains an IPv4 format - RTPS_DllAPI static bool isIPv4( + FASTDDS_EXPORTED_API static bool isIPv4( const std::string& address); //! Check whether a string contains an IPv6 format - RTPS_DllAPI static bool isIPv6( + FASTDDS_EXPORTED_API static bool isIPv6( const std::string& address); protected: diff --git a/include/fastrtps/utils/StringMatching.h b/include/fastrtps/utils/StringMatching.h index ca892aff459..81b0fbc5495 100644 --- a/include/fastrtps/utils/StringMatching.h +++ b/include/fastrtps/utils/StringMatching.h @@ -20,7 +20,7 @@ #ifndef STRINGMATCHING_H_ #define STRINGMATCHING_H_ -#include +#include #include #include @@ -35,7 +35,7 @@ namespace rtps { section B.6). @ingroup UTILITIES_MODULE */ -class RTPS_DllAPI StringMatching +class FASTDDS_EXPORTED_API StringMatching { public: diff --git a/include/fastrtps/utils/md5.h b/include/fastrtps/utils/md5.h index b718947f6e6..4842bee38fd 100644 --- a/include/fastrtps/utils/md5.h +++ b/include/fastrtps/utils/md5.h @@ -1,6 +1,6 @@ /* MD5 - converted to C++ class by Frank Thilo (thilo@unix-ag.org) - for bzflag (http://www.bzflag.org) + converted to C++ class by Frank Thilo (thilo@unix-ag.org) + for bzflag (http://www.bzflag.org) based on: @@ -8,27 +8,27 @@ reference implementation of RFC 1321 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. + rights reserved. -License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function. + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD5 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. -License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work. + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD5 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. -RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. -These notices must be retained in any copies of any part of this -documentation and/or software. + These notices must be retained in any copies of any part of this + documentation and/or software. -*/ + */ #ifndef BZF_MD5_H #define BZF_MD5_H @@ -36,66 +36,127 @@ documentation and/or software. #include #include -#include "../fastrtps_dll.h" +#include /** -* Class MD5, for calculating MD5 hashes of strings or byte arrays -* it is not meant to be fast or secure -* -* usage: 1) feed it blocks of uchars with update() -* 2) finalize() -* 3) get hexdigest() string -* or -* MD5(std::string).hexdigest() -* -* assumes that char is 8 bit and int is 32 bit + * Class MD5, for calculating MD5 hashes of strings or byte arrays + * it is not meant to be fast or secure + * + * usage: 1) feed it blocks of uchars with update() + * 2) finalize() + * 3) get hexdigest() string + * or + * MD5(std::string).hexdigest() + * + * assumes that char is 8 bit and int is 32 bit * @ingroup UTILITIES_MODULE -*/ -class RTPS_DllAPI MD5 + */ +class FASTDDS_EXPORTED_API MD5 { public: + typedef unsigned char uint1; // 8bit - typedef unsigned int size_type; // must be 32bit - - MD5(); - MD5(const std::string& text); - void update(const unsigned char *buf, size_type length); - void update(const char *buf, size_type length); - MD5& finalize(); - std::string hexdigest() const; - friend std::ostream& operator<<(std::ostream&, MD5& md5); + typedef unsigned int size_type; // must be 32bit + + MD5(); + MD5( + const std::string& text); + void update( + const unsigned char* buf, + size_type length); + void update( + const char* buf, + size_type length); + MD5& finalize(); + std::string hexdigest() const; + friend std::ostream& operator <<( + std::ostream&, + MD5& md5); uint1 digest[16]; // the result - void init(); + void init(); + private: - - - typedef unsigned int uint4; // 32bit - enum {blocksize = 64}; // VC6 won't eat a const static int here - - void transform(const uint1 block[blocksize]); - static void decode(uint4 output[], const uint1 input[], size_type len); - static void encode(uint1 output[], const uint4 input[], size_type len); - - bool finalized; - uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk - uint4 count[2]; // 64bit counter for number of bits (lo, hi) - uint4 state[4]; // digest so far - - - // low level logic operations - static inline uint4 F(uint4 x, uint4 y, uint4 z); - static inline uint4 G(uint4 x, uint4 y, uint4 z); - static inline uint4 H(uint4 x, uint4 y, uint4 z); - static inline uint4 I(uint4 x, uint4 y, uint4 z); - static inline uint4 rotate_left(uint4 x, int n); - static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); - static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac); + + typedef unsigned int uint4; // 32bit + enum + { + blocksize = 64 + }; // VC6 won't eat a const static int here + + void transform( + const uint1 block[blocksize]); + static void decode( + uint4 output[], + const uint1 input[], + size_type len); + static void encode( + uint1 output[], + const uint4 input[], + size_type len); + + bool finalized; + uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk + uint4 count[2]; // 64bit counter for number of bits (lo, hi) + uint4 state[4]; // digest so far + + + // low level logic operations + static inline uint4 F( + uint4 x, + uint4 y, + uint4 z); + static inline uint4 G( + uint4 x, + uint4 y, + uint4 z); + static inline uint4 H( + uint4 x, + uint4 y, + uint4 z); + static inline uint4 I( + uint4 x, + uint4 y, + uint4 z); + static inline uint4 rotate_left( + uint4 x, + int n); + static inline void FF( + uint4& a, + uint4 b, + uint4 c, + uint4 d, + uint4 x, + uint4 s, + uint4 ac); + static inline void GG( + uint4& a, + uint4 b, + uint4 c, + uint4 d, + uint4 x, + uint4 s, + uint4 ac); + static inline void HH( + uint4& a, + uint4 b, + uint4 c, + uint4 d, + uint4 x, + uint4 s, + uint4 ac); + static inline void II( + uint4& a, + uint4 b, + uint4 c, + uint4 d, + uint4 x, + uint4 s, + uint4 ac); }; -std::string md5(const std::string str); +std::string md5( + const std::string str); -#endif +#endif // ifndef BZF_MD5_H diff --git a/src/cpp/dynamic-types/DynamicTypeBuilder.cpp b/src/cpp/dynamic-types/DynamicTypeBuilder.cpp index e4c06c29100..d39344e16d4 100644 --- a/src/cpp/dynamic-types/DynamicTypeBuilder.cpp +++ b/src/cpp/dynamic-types/DynamicTypeBuilder.cpp @@ -183,7 +183,7 @@ ReturnCode_t DynamicTypeBuilder::add_member( } } -RTPS_DllAPI MemberId DynamicTypeBuilder::get_member_id_by_name( +FASTDDS_EXPORTED_API MemberId DynamicTypeBuilder::get_member_id_by_name( const std::string& name) const { auto it = member_by_name_.find(name); diff --git a/src/cpp/dynamic-types/TypeObjectCdrAux.ipp b/src/cpp/dynamic-types/TypeObjectCdrAux.ipp index 7d765faa064..aa592ec4abe 100644 --- a/src/cpp/dynamic-types/TypeObjectCdrAux.ipp +++ b/src/cpp/dynamic-types/TypeObjectCdrAux.ipp @@ -16,4997 +16,5154 @@ #define DYNAMIC_TYPES_TYPEOBJECTCDRAUX_IPP namespace eprosima { -namespace fastcdr { -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonStructMember& data, - size_t& current_alignment) -{ + namespace fastcdr { + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonStructMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - calculate_serialized_size(calculator, data.member_flags(), current_alignment); - calculate_serialized_size(calculator, data.member_type_id(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + calculate_serialized_size(calculator, data.member_flags(), current_alignment); + calculate_serialized_size(calculator, data.member_type_id(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.member_id(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.member_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.member_type_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.member_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.member_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.member_type_id(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonStructMember& data) -{ - scdr << data.member_id(); + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonStructMember& data) + { + scdr << data.member_id(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.member_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.member_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.member_flags(); + scdr << data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.member_type_id(); -} + scdr << data.member_type_id(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonStructMember& data) -{ - dcdr >> data.member_id(); + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonStructMember& data) + { + dcdr >> data.member_id(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.member_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.member_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.member_flags(); + dcdr >> data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.member_type_id(); -} + dcdr >> data.member_type_id(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteMemberDetail& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteMemberDetail& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; - calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; + calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.ann_custom().size(); ++a) - { - calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.ann_custom().size(); ++a) + { + calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.name(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.ann_builtin(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.ann_custom(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.name(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.ann_builtin(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.ann_custom(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteMemberDetail& data) -{ - scdr << data.name(); - scdr << data.ann_builtin(); - scdr << data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteMemberDetail& data) + { + scdr << data.name(); + scdr << data.ann_builtin(); + scdr << data.ann_custom(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteMemberDetail& data) -{ - dcdr >> data.name(); - dcdr >> data.ann_builtin(); - dcdr >> data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteMemberDetail& data) + { + dcdr >> data.name(); + dcdr >> data.ann_builtin(); + dcdr >> data.ann_custom(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalMemberDetail& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalMemberDetail& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - static_cast(data); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + static_cast < void > (data); + size_t initial_alignment = current_alignment; - current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.name_hash(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.name_hash(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalMemberDetail& data) -{ - scdr << data.name_hash(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalMemberDetail& data) + { + scdr << data.name_hash(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalMemberDetail& data) -{ - dcdr >> data.name_hash(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalMemberDetail& data) + { + dcdr >> data.name_hash(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteStructMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteStructMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteStructMember& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteStructMember& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteStructMember& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteStructMember& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalStructMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalStructMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalStructMember& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalStructMember& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalStructMember& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalStructMember& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.verbatim(), current_alignment); + calculate_serialized_size(calculator, data.verbatim(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.verbatim(), current_alignment); - - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - - return calculated_size; - -#endif // FASTCDR_VERSION_MAJOR == 1 -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data) -{ - scdr << data.verbatim(); -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data) -{ - dcdr >> data.verbatim(); -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::types::MinimalTypeDetail&, - size_t&) -{ - return 0; -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr&, - const eprosima::fastrtps::types::MinimalTypeDetail&) -{ -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr&, - eprosima::fastrtps::types::MinimalTypeDetail&) -{ -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteTypeDetail& data, - size_t& current_alignment) -{ -#if FASTCDR_VERSION_MAJOR == 1 - - size_t initial_alignment = current_alignment; - - calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.ann_custom().size(); ++a) - { - calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); - } - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.type_name().size() + 1; - - return current_alignment - initial_alignment; - -#else + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.verbatim(), current_alignment); + + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + + return calculated_size; + +#endif // FASTCDR_VERSION_MAJOR == 1 + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data) + { + scdr << data.verbatim(); + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::AppliedBuiltinTypeAnnotations& data) + { + dcdr >> data.verbatim(); + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator&, + const eprosima::fastrtps::types::MinimalTypeDetail&, + size_t&) + { + return 0; + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr&, + const eprosima::fastrtps::types::MinimalTypeDetail&) + { + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr&, + eprosima::fastrtps::types::MinimalTypeDetail&) + { + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteTypeDetail& data, + size_t& current_alignment) + { +#if FASTCDR_VERSION_MAJOR == 1 + + size_t initial_alignment = current_alignment; + + calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.ann_custom().size(); ++a) + { + calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); + } + current_alignment += 4 + + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.type_name().size() + 1; + + return current_alignment - initial_alignment; + +#else + + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.ann_builtin(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.ann_custom(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.type_name(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.ann_builtin(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.ann_custom(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.type_name(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteTypeDetail& data) -{ - scdr << data.ann_builtin(); - scdr << data.ann_custom(); - scdr << data.type_name(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteTypeDetail& data) + { + scdr << data.ann_builtin(); + scdr << data.ann_custom(); + scdr << data.type_name(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteTypeDetail& data) -{ - dcdr >> data.ann_builtin(); - dcdr >> data.ann_custom(); - dcdr >> data.type_name(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteTypeDetail& data) + { + dcdr >> data.ann_builtin(); + dcdr >> data.ann_custom(); + dcdr >> data.type_name(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteStructHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteStructHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.base_type(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.base_type(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.base_type(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.base_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteStructHeader& data) -{ - scdr << data.base_type(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteStructHeader& data) + { + scdr << data.base_type(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteStructHeader& data) -{ - dcdr >> data.base_type(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteStructHeader& data) + { + dcdr >> data.base_type(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalStructHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalStructHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.base_type(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.base_type(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.base_type(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.base_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalStructHeader& data) -{ - scdr << data.base_type(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalStructHeader& data) + { + scdr << data.base_type(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalStructHeader& data) -{ - dcdr >> data.base_type(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalStructHeader& data) + { + dcdr >> data.base_type(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteStructType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteStructType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.struct_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); - } + calculate_serialized_size(calculator, data.struct_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.struct_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.struct_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteStructType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteStructType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.struct_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.struct_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.struct_flags(); + scdr << data.struct_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteStructType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteStructType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.struct_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.struct_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.struct_flags(); + dcdr >> data.struct_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalStructType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalStructType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.struct_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); - } + calculate_serialized_size(calculator, data.struct_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.struct_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.struct_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalStructType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalStructType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.struct_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.struct_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.struct_flags(); + scdr << data.struct_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalStructType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalStructType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.struct_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.struct_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.struct_flags(); + dcdr >> data.struct_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonUnionMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonUnionMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - calculate_serialized_size(calculator, data.member_flags(), current_alignment); - calculate_serialized_size(calculator, data.type_id(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + calculate_serialized_size(calculator, data.member_flags(), current_alignment); + calculate_serialized_size(calculator, data.type_id(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.label_seq().size(); ++a) - { - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.label_seq().size(); ++a) + { + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.member_id(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.member_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.type_id(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.label_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.member_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.member_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.type_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.label_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonUnionMember& data) -{ - scdr << data.member_id(); + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonUnionMember& data) + { + scdr << data.member_id(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.member_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.member_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.member_flags(); + scdr << data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.type_id(); - scdr << data.label_seq(); -} + scdr << data.type_id(); + scdr << data.label_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonUnionMember& data) -{ - dcdr >> data.member_id(); + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonUnionMember& data) + { + dcdr >> data.member_id(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.member_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.member_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.member_flags(); + dcdr >> data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.type_id(); - dcdr >> data.label_seq(); -} + dcdr >> data.type_id(); + dcdr >> data.label_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteUnionMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteUnionMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteUnionMember& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteUnionMember& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteUnionMember& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteUnionMember& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalUnionMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalUnionMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalUnionMember& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalUnionMember& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalUnionMember& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalUnionMember& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonDiscriminatorMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonDiscriminatorMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.member_flags(), current_alignment); - calculate_serialized_size(calculator, data.type_id(), current_alignment); + calculate_serialized_size(calculator, data.member_flags(), current_alignment); + calculate_serialized_size(calculator, data.type_id(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.member_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.type_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.member_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.type_id(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonDiscriminatorMember& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonDiscriminatorMember& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.member_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.member_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.member_flags(); + scdr << data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.type_id(); -} + scdr << data.type_id(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonDiscriminatorMember& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonDiscriminatorMember& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.member_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.member_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.member_flags(); + dcdr >> data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.type_id(); -} + dcdr >> data.type_id(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteDiscriminatorMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteDiscriminatorMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.ann_custom().size(); ++a) - { - calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.ann_custom().size(); ++a) + { + calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.ann_builtin(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.ann_custom(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.ann_builtin(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.ann_custom(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteDiscriminatorMember& data) -{ - scdr << data.common(); - scdr << data.ann_builtin(); - scdr << data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteDiscriminatorMember& data) + { + scdr << data.common(); + scdr << data.ann_builtin(); + scdr << data.ann_custom(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteDiscriminatorMember& data) -{ - dcdr >> data.common(); - dcdr >> data.ann_builtin(); - dcdr >> data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteDiscriminatorMember& data) + { + dcdr >> data.common(); + dcdr >> data.ann_builtin(); + dcdr >> data.ann_custom(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalDiscriminatorMember& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalDiscriminatorMember& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalDiscriminatorMember& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalDiscriminatorMember& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalDiscriminatorMember& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalDiscriminatorMember& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteUnionHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteUnionHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteUnionHeader& data) -{ - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteUnionHeader& data) + { + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteUnionHeader& data) -{ - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteUnionHeader& data) + { + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalUnionHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalUnionHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalUnionHeader& data) -{ - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalUnionHeader& data) + { + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalUnionHeader& data) -{ - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalUnionHeader& data) + { + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteUnionType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteUnionType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.union_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.discriminator(), current_alignment); + calculate_serialized_size(calculator, data.union_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.discriminator(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.union_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.discriminator(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.union_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.discriminator(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteUnionType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteUnionType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.union_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.union_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.union_flags(); + scdr << data.union_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.discriminator(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.discriminator(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteUnionType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteUnionType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.union_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.union_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.union_flags(); + dcdr >> data.union_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.discriminator(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.discriminator(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalUnionType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalUnionType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.union_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.discriminator(), current_alignment); + calculate_serialized_size(calculator, data.union_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.discriminator(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.union_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.discriminator(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.union_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.discriminator(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalUnionType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalUnionType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.union_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.union_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.union_flags(); + scdr << data.union_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.discriminator(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.discriminator(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalUnionType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalUnionType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.union_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.union_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.union_flags(); + dcdr >> data.union_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.discriminator(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.discriminator(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonAnnotationParameter& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonAnnotationParameter& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.member_flags(), current_alignment); - calculate_serialized_size(calculator, data.member_type_id(), current_alignment); + calculate_serialized_size(calculator, data.member_flags(), current_alignment); + calculate_serialized_size(calculator, data.member_type_id(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.member_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.member_type_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.member_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.member_type_id(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonAnnotationParameter& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonAnnotationParameter& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.member_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.member_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.member_flags(); + scdr << data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.member_type_id(); -} + scdr << data.member_type_id(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonAnnotationParameter& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonAnnotationParameter& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.member_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.member_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.member_flags(); + dcdr >> data.member_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.member_type_id(); -} + dcdr >> data.member_type_id(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAnnotationParameter& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAnnotationParameter& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; - calculate_serialized_size(calculator, data.default_value(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; + calculate_serialized_size(calculator, data.default_value(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.name(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.default_value(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.name(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.default_value(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAnnotationParameter& data) -{ - scdr << data.common(); - scdr << data.name(); - scdr << data.default_value(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAnnotationParameter& data) + { + scdr << data.common(); + scdr << data.name(); + scdr << data.default_value(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAnnotationParameter& data) -{ - dcdr >> data.common(); - dcdr >> data.name(); - dcdr >> data.default_value(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAnnotationParameter& data) + { + dcdr >> data.common(); + dcdr >> data.name(); + dcdr >> data.default_value(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalAnnotationParameter& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalAnnotationParameter& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; - calculate_serialized_size(calculator, data.default_value(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.name().size() + 1; + calculate_serialized_size(calculator, data.default_value(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.name(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.default_value(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.name(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.default_value(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalAnnotationParameter& data) -{ - scdr << data.common(); - scdr << data.name(); - scdr << data.default_value(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalAnnotationParameter& data) + { + scdr << data.common(); + scdr << data.name(); + scdr << data.default_value(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalAnnotationParameter& data) -{ - dcdr >> data.common(); - dcdr >> data.name(); - dcdr >> data.default_value(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalAnnotationParameter& data) + { + dcdr >> data.common(); + dcdr >> data.name(); + dcdr >> data.default_value(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAnnotationHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAnnotationHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + size_t initial_alignment = current_alignment; - current_alignment += 4 + - eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.annotation_name().size() + 1; + current_alignment += 4 + + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.annotation_name().size() + 1; - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.annotation_name(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.annotation_name(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAnnotationHeader& data) -{ - scdr << data.annotation_name(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAnnotationHeader& data) + { + scdr << data.annotation_name(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAnnotationHeader& data) -{ - dcdr >> data.annotation_name(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAnnotationHeader& data) + { + dcdr >> data.annotation_name(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::types::MinimalAnnotationHeader&, - size_t&) -{ - return 0; -} + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator&, + const eprosima::fastrtps::types::MinimalAnnotationHeader&, + size_t&) + { + return 0; + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr&, - const eprosima::fastrtps::types::MinimalAnnotationHeader&) -{ -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr&, + const eprosima::fastrtps::types::MinimalAnnotationHeader&) + { + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr&, - eprosima::fastrtps::types::MinimalAnnotationHeader&) -{ -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr&, + eprosima::fastrtps::types::MinimalAnnotationHeader&) + { + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAnnotationType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAnnotationType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.annotation_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.annotation_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at( - a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at( + a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.annotation_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.annotation_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAnnotationType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAnnotationType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.annotation_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.annotation_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.annotation_flag(); + scdr << data.annotation_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAnnotationType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAnnotationType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.annotation_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.annotation_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.annotation_flag(); + dcdr >> data.annotation_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalAnnotationType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalAnnotationType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.annotation_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.annotation_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.member_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.member_seq().at(a), - current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.member_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.member_seq().at(a), + current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.annotation_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.member_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.annotation_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.member_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalAnnotationType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalAnnotationType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.annotation_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.annotation_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.annotation_flag(); + scdr << data.annotation_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.member_seq(); -} + scdr << data.header(); + scdr << data.member_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalAnnotationType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalAnnotationType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.annotation_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.annotation_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.annotation_flag(); + dcdr >> data.annotation_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.member_seq(); -} + dcdr >> data.header(); + dcdr >> data.member_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonAliasBody& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonAliasBody& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.related_flags(), current_alignment); - calculate_serialized_size(calculator, data.related_type(), current_alignment); + calculate_serialized_size(calculator, data.related_flags(), current_alignment); + calculate_serialized_size(calculator, data.related_type(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.related_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.related_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.related_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.related_type(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonAliasBody& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonAliasBody& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.related_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.related_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.related_flags(); + scdr << data.related_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.related_type(); -} + scdr << data.related_type(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonAliasBody& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonAliasBody& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.related_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.related_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.related_flags(); + dcdr >> data.related_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.related_type(); -} + dcdr >> data.related_type(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAliasBody& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAliasBody& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.ann_custom().size(); ++a) - { - calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.ann_custom().size(); ++a) + { + calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.ann_builtin(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.ann_custom(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.ann_builtin(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.ann_custom(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAliasBody& data) -{ - scdr << data.common(); - scdr << data.ann_builtin(); - scdr << data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAliasBody& data) + { + scdr << data.common(); + scdr << data.ann_builtin(); + scdr << data.ann_custom(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAliasBody& data) -{ - dcdr >> data.common(); - dcdr >> data.ann_builtin(); - dcdr >> data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAliasBody& data) + { + dcdr >> data.common(); + dcdr >> data.ann_builtin(); + dcdr >> data.ann_custom(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalAliasBody& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalAliasBody& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalAliasBody& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalAliasBody& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalAliasBody& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalAliasBody& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAliasHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAliasHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAliasHeader& data) -{ - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAliasHeader& data) + { + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAliasHeader& data) -{ - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAliasHeader& data) + { + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::types::MinimalAliasHeader&, - size_t&) -{ - return 0; -} + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator&, + const eprosima::fastrtps::types::MinimalAliasHeader&, + size_t&) + { + return 0; + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr&, - const eprosima::fastrtps::types::MinimalAliasHeader&) -{ -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr&, + const eprosima::fastrtps::types::MinimalAliasHeader&) + { + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr&, - eprosima::fastrtps::types::MinimalAliasHeader&) -{ -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr&, + eprosima::fastrtps::types::MinimalAliasHeader&) + { + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteAliasType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteAliasType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.alias_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.body(), current_alignment); + calculate_serialized_size(calculator, data.alias_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.body(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.alias_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.body(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.alias_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.body(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteAliasType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteAliasType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.alias_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.alias_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.alias_flags(); + scdr << data.alias_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.body(); -} + scdr << data.header(); + scdr << data.body(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteAliasType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteAliasType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.alias_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.alias_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.alias_flags(); + dcdr >> data.alias_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.body(); -} + dcdr >> data.header(); + dcdr >> data.body(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalAliasType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalAliasType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.alias_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.body(), current_alignment); + calculate_serialized_size(calculator, data.alias_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.body(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.alias_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.body(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.alias_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.body(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalAliasType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalAliasType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.alias_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.alias_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.alias_flags(); + scdr << data.alias_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.body(); -} + scdr << data.header(); + scdr << data.body(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalAliasType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalAliasType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.alias_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.alias_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.alias_flags(); + dcdr >> data.alias_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.body(); -} + dcdr >> data.header(); + dcdr >> data.body(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteElementDetail& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteElementDetail& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); + calculate_serialized_size(calculator, data.ann_builtin(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.ann_custom().size(); ++a) - { - calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.ann_custom().size(); ++a) + { + calculate_serialized_size(calculator, data.ann_custom().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.ann_builtin(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.ann_custom(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.ann_builtin(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.ann_custom(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteElementDetail& data) -{ - scdr << data.ann_builtin(); - scdr << data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteElementDetail& data) + { + scdr << data.ann_builtin(); + scdr << data.ann_custom(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteElementDetail& data) -{ - dcdr >> data.ann_builtin(); - dcdr >> data.ann_custom(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteElementDetail& data) + { + dcdr >> data.ann_builtin(); + dcdr >> data.ann_custom(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonCollectionElement& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonCollectionElement& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.element_flags(), current_alignment); - calculate_serialized_size(calculator, data.type(), current_alignment); + calculate_serialized_size(calculator, data.element_flags(), current_alignment); + calculate_serialized_size(calculator, data.type(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.element_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.element_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.type(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonCollectionElement& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonCollectionElement& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.element_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.element_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.element_flags(); + scdr << data.element_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.type(); -} + scdr << data.type(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonCollectionElement& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonCollectionElement& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.element_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.element_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.element_flags(); + dcdr >> data.element_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.type(); -} + dcdr >> data.type(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteCollectionElement& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteCollectionElement& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteCollectionElement& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteCollectionElement& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteCollectionElement& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteCollectionElement& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalCollectionElement& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalCollectionElement& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalCollectionElement& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalCollectionElement& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalCollectionElement& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalCollectionElement& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonCollectionHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonCollectionHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - static_cast(data); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + static_cast < void > (data); + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + 255 + 1; + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + 255 + 1; - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bound(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bound(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonCollectionHeader& data) -{ - scdr << data.bound(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonCollectionHeader& data) + { + scdr << data.bound(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonCollectionHeader& data) -{ - dcdr >> data.bound(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonCollectionHeader& data) + { + dcdr >> data.bound(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteCollectionHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteCollectionHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteCollectionHeader& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteCollectionHeader& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteCollectionHeader& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteCollectionHeader& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalCollectionHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalCollectionHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalCollectionHeader& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalCollectionHeader& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalCollectionHeader& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalCollectionHeader& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalSequenceType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalSequenceType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - // FIXED_SIXE current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + // FIXED_SIXE current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - // STRING current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.str().size() + 1; - // SEQUENCE - /* - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for(size_t a = 0; a < data.param_seq().size(); ++a) - { - current_alignment += AppliedAnnotationParameter::getCdrSerializedSize(data.param_seq().at(a), current_alignment); - } - */ + // STRING current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.str().size() + 1; + // SEQUENCE + /* + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for(size_t a = 0; a < data.param_seq().size(); ++a) + { + current_alignment += AppliedAnnotationParameter::getCdrSerializedSize(data.param_seq().at(a), current_alignment); + } + */ - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteSequenceType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteSequenceType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteSequenceType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteSequenceType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteSequenceType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteSequenceType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - // FIXED_SIXE current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + // FIXED_SIXE current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - // STRING current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.str().size() + 1; - // SEQUENCE - /* - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for(size_t a = 0; a < data.param_seq().size(); ++a) - { - current_alignment += AppliedAnnotationParameter::getCdrSerializedSize(data.param_seq().at(a), current_alignment); - } - */ + // STRING current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.str().size() + 1; + // SEQUENCE + /* + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for(size_t a = 0; a < data.param_seq().size(); ++a) + { + current_alignment += AppliedAnnotationParameter::getCdrSerializedSize(data.param_seq().at(a), current_alignment); + } + */ - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalSequenceType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalSequenceType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalSequenceType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalSequenceType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonArrayHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonArrayHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.bound_seq().size(); ++a) - { - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.bound_seq().size(); ++a) + { + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bound_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bound_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonArrayHeader& data) -{ - scdr << data.bound_seq(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonArrayHeader& data) + { + scdr << data.bound_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonArrayHeader& data) -{ - dcdr >> data.bound_seq(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonArrayHeader& data) + { + dcdr >> data.bound_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteArrayHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteArrayHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteArrayHeader& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteArrayHeader& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteArrayHeader& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteArrayHeader& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalArrayHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalArrayHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalArrayHeader& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalArrayHeader& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalArrayHeader& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalArrayHeader& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteArrayType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteArrayType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteArrayType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteArrayType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteArrayType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteArrayType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalArrayType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalArrayType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalArrayType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalArrayType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalArrayType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalArrayType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteMapType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteMapType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.key(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.key(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.key(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.key(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteMapType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteMapType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.key(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.key(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteMapType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteMapType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.key(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.key(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalMapType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalMapType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.collection_flag(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - calculate_serialized_size(calculator, data.key(), current_alignment); - calculate_serialized_size(calculator, data.element(), current_alignment); + calculate_serialized_size(calculator, data.collection_flag(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.key(), current_alignment); + calculate_serialized_size(calculator, data.element(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.collection_flag(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.key(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.element(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.collection_flag(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.key(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.element(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalMapType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalMapType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.collection_flag().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.collection_flag().bitset().to_ulong()); + scdr << bits; #else - scdr << data.collection_flag(); + scdr << data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.key(); - scdr << data.element(); -} + scdr << data.header(); + scdr << data.key(); + scdr << data.element(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalMapType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalMapType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.collection_flag().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.collection_flag().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.collection_flag(); + dcdr >> data.collection_flag(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.key(); - dcdr >> data.element(); -} + dcdr >> data.header(); + dcdr >> data.key(); + dcdr >> data.element(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonEnumeratedLiteral& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonEnumeratedLiteral& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - calculate_serialized_size(calculator, data.flags(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + calculate_serialized_size(calculator, data.flags(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.value(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.value(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.flags(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonEnumeratedLiteral& data) -{ - scdr << data.value(); + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonEnumeratedLiteral& data) + { + scdr << data.value(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.flags(); + scdr << data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonEnumeratedLiteral& data) -{ - dcdr >> data.value(); + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonEnumeratedLiteral& data) + { + dcdr >> data.value(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.flags(); + dcdr >> data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteEnumeratedLiteral& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteEnumeratedLiteral& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteEnumeratedLiteral& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteEnumeratedLiteral& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteEnumeratedLiteral& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteEnumeratedLiteral& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalEnumeratedLiteral& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalEnumeratedLiteral& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalEnumeratedLiteral& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalEnumeratedLiteral& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalEnumeratedLiteral& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalEnumeratedLiteral& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonEnumeratedHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonEnumeratedHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - static_cast(data); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + static_cast < void > (data); + size_t initial_alignment = current_alignment; - current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); + current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bit_bound(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bit_bound(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonEnumeratedHeader& data) -{ - scdr << data.bit_bound(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonEnumeratedHeader& data) + { + scdr << data.bit_bound(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonEnumeratedHeader& data) -{ - dcdr >> data.bit_bound(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonEnumeratedHeader& data) + { + dcdr >> data.bit_bound(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteEnumeratedHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteEnumeratedHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteEnumeratedHeader& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteEnumeratedHeader& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteEnumeratedHeader& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteEnumeratedHeader& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalEnumeratedHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalEnumeratedHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalEnumeratedHeader& data) -{ - scdr << data.common(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalEnumeratedHeader& data) + { + scdr << data.common(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalEnumeratedHeader& data) -{ - dcdr >> data.common(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalEnumeratedHeader& data) + { + dcdr >> data.common(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteEnumeratedType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteEnumeratedType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.enum_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.enum_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.literal_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.literal_seq().at(a), - current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.literal_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.literal_seq().at(a), + current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.enum_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.literal_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.enum_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.literal_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteEnumeratedType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteEnumeratedType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.enum_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.enum_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.enum_flags(); + scdr << data.enum_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.literal_seq(); -} + scdr << data.header(); + scdr << data.literal_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteEnumeratedType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteEnumeratedType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.enum_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.enum_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.enum_flags(); + dcdr >> data.enum_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.literal_seq(); -} + dcdr >> data.header(); + dcdr >> data.literal_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalEnumeratedType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalEnumeratedType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.enum_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.enum_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.literal_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.literal_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.literal_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.literal_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.enum_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.literal_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.enum_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.literal_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalEnumeratedType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalEnumeratedType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.enum_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.enum_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.enum_flags(); + scdr << data.enum_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.literal_seq(); -} + scdr << data.header(); + scdr << data.literal_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalEnumeratedType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalEnumeratedType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.enum_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.enum_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.enum_flags(); + dcdr >> data.enum_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.literal_seq(); -} + dcdr >> data.header(); + dcdr >> data.literal_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonBitflag& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonBitflag& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); - calculate_serialized_size(calculator, data.flags(), current_alignment); + current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); + calculate_serialized_size(calculator, data.flags(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.position(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.position(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.flags(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonBitflag& data) -{ - scdr << data.position(); + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonBitflag& data) + { + scdr << data.position(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.flags(); + scdr << data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonBitflag& data) -{ - dcdr >> data.position(); + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonBitflag& data) + { + dcdr >> data.position(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.flags(); + dcdr >> data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteBitflag& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteBitflag& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteBitflag& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteBitflag& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteBitflag& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteBitflag& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalBitflag& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalBitflag& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalBitflag& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalBitflag& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalBitflag& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalBitflag& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonBitmaskHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonBitmaskHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - static_cast(calculator); - static_cast(data); - size_t initial_alignment = current_alignment; + static_cast < void > (calculator); + static_cast < void > (data); + size_t initial_alignment = current_alignment; - current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); + current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bit_bound(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bit_bound(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonBitmaskHeader& data) -{ - scdr << data.bit_bound(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonBitmaskHeader& data) + { + scdr << data.bit_bound(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonBitmaskHeader& data) -{ - dcdr >> data.bit_bound(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonBitmaskHeader& data) + { + dcdr >> data.bit_bound(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteBitmaskType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteBitmaskType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.bitmask_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.bitmask_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.flag_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.flag_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.flag_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.flag_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bitmask_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.flag_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bitmask_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.flag_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteBitmaskType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteBitmaskType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.bitmask_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.bitmask_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.bitmask_flags(); + scdr << data.bitmask_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.flag_seq(); -} + scdr << data.header(); + scdr << data.flag_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteBitmaskType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteBitmaskType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.bitmask_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.bitmask_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.bitmask_flags(); + dcdr >> data.bitmask_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.flag_seq(); -} + dcdr >> data.header(); + dcdr >> data.flag_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalBitmaskType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalBitmaskType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.bitmask_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.bitmask_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.flag_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.flag_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.flag_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.flag_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bitmask_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.flag_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bitmask_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.flag_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalBitmaskType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalBitmaskType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.bitmask_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.bitmask_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.bitmask_flags(); + scdr << data.bitmask_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.flag_seq(); -} + scdr << data.header(); + scdr << data.flag_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalBitmaskType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalBitmaskType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.bitmask_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.bitmask_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.bitmask_flags(); + dcdr >> data.bitmask_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.flag_seq(); -} + dcdr >> data.header(); + dcdr >> data.flag_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CommonBitfield& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CommonBitfield& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); - calculate_serialized_size(calculator, data.flags(), current_alignment); - current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + current_alignment += 2 + eprosima::fastcdr::Cdr::alignment(current_alignment, 2); + calculate_serialized_size(calculator, data.flags(), current_alignment); + current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.position(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.bitcount(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.holder_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.position(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.bitcount(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.holder_type(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CommonBitfield& data) -{ - scdr << data.position(); + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CommonBitfield& data) + { + scdr << data.position(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.flags(); + scdr << data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.bitcount(); - scdr << data.holder_type(); -} + scdr << data.bitcount(); + scdr << data.holder_type(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CommonBitfield& data) -{ - dcdr >> data.position(); + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CommonBitfield& data) + { + dcdr >> data.position(); #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.flags(); + dcdr >> data.flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.bitcount(); - dcdr >> data.holder_type(); -} + dcdr >> data.bitcount(); + dcdr >> data.holder_type(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteBitfield& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteBitfield& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.common(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.detail(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteBitfield& data) -{ - scdr << data.common(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteBitfield& data) + { + scdr << data.common(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteBitfield& data) -{ - dcdr >> data.common(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteBitfield& data) + { + dcdr >> data.common(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalBitfield& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalBitfield& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.common(), current_alignment); - current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + calculate_serialized_size(calculator, data.common(), current_alignment); + current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.common(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.name_hash(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.common(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.name_hash(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalBitfield& data) -{ - scdr << data.common(); - scdr << data.name_hash(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalBitfield& data) + { + scdr << data.common(); + scdr << data.name_hash(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalBitfield& data) -{ - dcdr >> data.common(); - dcdr >> data.name_hash(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalBitfield& data) + { + dcdr >> data.common(); + dcdr >> data.name_hash(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteBitsetHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteBitsetHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.base_type(), current_alignment); - calculate_serialized_size(calculator, data.detail(), current_alignment); + calculate_serialized_size(calculator, data.base_type(), current_alignment); + calculate_serialized_size(calculator, data.detail(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.detail(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.base_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.detail(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.base_type(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteBitsetHeader& data) -{ - scdr << data.base_type(); - scdr << data.detail(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteBitsetHeader& data) + { + scdr << data.base_type(); + scdr << data.detail(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteBitsetHeader& data) -{ - dcdr >> data.base_type(); - dcdr >> data.detail(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteBitsetHeader& data) + { + dcdr >> data.base_type(); + dcdr >> data.detail(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalBitsetHeader& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalBitsetHeader& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.base_type(), current_alignment); + calculate_serialized_size(calculator, data.base_type(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.base_type(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.base_type(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalBitsetHeader& data) -{ - scdr << data.base_type(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalBitsetHeader& data) + { + scdr << data.base_type(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalBitsetHeader& data) -{ - dcdr >> data.base_type(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalBitsetHeader& data) + { + dcdr >> data.base_type(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteBitsetType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteBitsetType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.bitset_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); + calculate_serialized_size(calculator, data.bitset_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.field_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.field_seq().at(a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.field_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.field_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bitset_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.field_seq(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.bitset_flags(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.field_seq(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteBitsetType& data) -{ + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteBitsetType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.bitset_flags().bitset().to_ulong()); - scdr << bits; + uint16_t bits = static_cast < uint16_t > (data.bitset_flags().bitset().to_ulong()); + scdr << bits; #else - scdr << data.bitset_flags(); + scdr << data.bitset_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.field_seq(); -} + scdr << data.header(); + scdr << data.field_seq(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteBitsetType& data) -{ + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteBitsetType& data) + { #if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.bitset_flags().bitset(std::bitset<16>(bits)); + uint16_t bits; + dcdr >> bits; + data.bitset_flags().bitset(std::bitset < 16 > (bits)); #else - dcdr >> data.bitset_flags(); + dcdr >> data.bitset_flags(); #endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.field_seq(); -} + dcdr >> data.header(); + dcdr >> data.field_seq(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalBitsetType& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalBitsetType& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; - - calculate_serialized_size(calculator, data.bitset_flags(), current_alignment); - calculate_serialized_size(calculator, data.header(), current_alignment); - - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.field_seq().size(); ++a) - { - calculate_serialized_size(calculator, data.field_seq().at(a), current_alignment); - } - - return current_alignment - initial_alignment; + size_t initial_alignment = current_alignment; -#else - - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.bitset_flags(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.header(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.field_seq(), current_alignment); - - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - - return calculated_size; - -#endif // FASTCDR_VERSION_MAJOR == 1 -} + calculate_serialized_size(calculator, data.bitset_flags(), current_alignment); + calculate_serialized_size(calculator, data.header(), current_alignment); -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalBitsetType& data) -{ -#if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits = static_cast(data.bitset_flags().bitset().to_ulong()); - scdr << bits; -#else - scdr << data.bitset_flags(); -#endif // FASTCDR_VERSION_MAJOR == 1 - scdr << data.header(); - scdr << data.field_seq(); -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalBitsetType& data) -{ -#if FASTCDR_VERSION_MAJOR == 1 - uint16_t bits; - dcdr >> bits; - data.bitset_flags().bitset(std::bitset<16>(bits)); -#else - dcdr >> data.bitset_flags(); -#endif // FASTCDR_VERSION_MAJOR == 1 - dcdr >> data.header(); - dcdr >> data.field_seq(); -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::types::CompleteExtendedType&, - size_t&) -{ - return 0; -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr&, - const eprosima::fastrtps::types::CompleteExtendedType&) -{ -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr&, - eprosima::fastrtps::types::CompleteExtendedType&) -{ -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::types::MinimalExtendedType&, - size_t&) -{ - return 0; -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr&, - const eprosima::fastrtps::types::MinimalExtendedType&) -{ -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr&, - eprosima::fastrtps::types::MinimalExtendedType&) -{ -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::CompleteTypeObject& data, - size_t& current_alignment) -{ -#if FASTCDR_VERSION_MAJOR == 1 - - size_t initial_alignment = current_alignment; - - current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - calculate_serialized_size(calculator, data.alias_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - calculate_serialized_size(calculator, data.annotation_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - calculate_serialized_size(calculator, data.struct_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_UNION: - calculate_serialized_size(calculator, data.union_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITSET: - calculate_serialized_size(calculator, data.bitset_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - calculate_serialized_size(calculator, data.sequence_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ARRAY: - calculate_serialized_size(calculator, data.array_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_MAP: - calculate_serialized_size(calculator, data.map_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ENUM: - calculate_serialized_size(calculator, data.enumerated_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITMASK: - calculate_serialized_size(calculator, data.bitmask_type(), current_alignment); - break; - default: - calculate_serialized_size(calculator, data.extended_type(), current_alignment); - break; - } - - return current_alignment - initial_alignment; - -#else - - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data._d(), current_alignment); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.alias_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.annotation_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.struct_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_UNION: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 4), data.union_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITSET: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 5), data.bitset_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 6), data.sequence_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ARRAY: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 7), data.array_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_MAP: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 8), data.map_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ENUM: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 9), data.enumerated_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITMASK: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 10), data.bitmask_type(), current_alignment); - break; - default: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 11), data.extended_type(), current_alignment); - break; - } - - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - - return calculated_size; - -#endif // FASTCDR_VERSION_MAJOR == 1 -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::CompleteTypeObject& data) -{ - scdr << data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - scdr << data.alias_type(); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - scdr << data.annotation_type(); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - scdr << data.struct_type(); - break; - case eprosima::fastrtps::types::TK_UNION: - scdr << data.union_type(); - break; - case eprosima::fastrtps::types::TK_BITSET: - scdr << data.bitset_type(); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - scdr << data.sequence_type(); - break; - case eprosima::fastrtps::types::TK_ARRAY: - scdr << data.array_type(); - break; - case eprosima::fastrtps::types::TK_MAP: - scdr << data.map_type(); - break; - case eprosima::fastrtps::types::TK_ENUM: - scdr << data.enumerated_type(); - break; - case eprosima::fastrtps::types::TK_BITMASK: - scdr << data.bitmask_type(); - break; - default: - scdr << data.extended_type(); - break; - } -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::CompleteTypeObject& data) -{ - dcdr >> data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - dcdr >> data.alias_type(); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - dcdr >> data.annotation_type(); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - dcdr >> data.struct_type(); - break; - case eprosima::fastrtps::types::TK_UNION: - dcdr >> data.union_type(); - break; - case eprosima::fastrtps::types::TK_BITSET: - dcdr >> data.bitset_type(); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - dcdr >> data.sequence_type(); - break; - case eprosima::fastrtps::types::TK_ARRAY: - dcdr >> data.array_type(); - break; - case eprosima::fastrtps::types::TK_MAP: - dcdr >> data.map_type(); - break; - case eprosima::fastrtps::types::TK_ENUM: - dcdr >> data.enumerated_type(); - break; - case eprosima::fastrtps::types::TK_BITMASK: - dcdr >> data.bitmask_type(); - break; - default: - dcdr >> data.extended_type(); - break; - } -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::MinimalTypeObject& data, - size_t& current_alignment) -{ -#if FASTCDR_VERSION_MAJOR == 1 - - size_t initial_alignment = current_alignment; - - current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - calculate_serialized_size(calculator, data.alias_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - calculate_serialized_size(calculator, data.annotation_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - calculate_serialized_size(calculator, data.struct_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_UNION: - calculate_serialized_size(calculator, data.union_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITSET: - calculate_serialized_size(calculator, data.bitset_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - calculate_serialized_size(calculator, data.sequence_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ARRAY: - calculate_serialized_size(calculator, data.array_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_MAP: - calculate_serialized_size(calculator, data.map_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ENUM: - calculate_serialized_size(calculator, data.enumerated_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITMASK: - calculate_serialized_size(calculator, data.bitmask_type(), current_alignment); - break; - default: - calculate_serialized_size(calculator, data.extended_type(), current_alignment); - break; - } - - return current_alignment - initial_alignment; - -#else - - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; - - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data._d(), current_alignment); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.alias_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.annotation_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 3), data.struct_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_UNION: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 4), data.union_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITSET: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 5), data.bitset_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 6), data.sequence_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ARRAY: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 7), data.array_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_MAP: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 8), data.map_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_ENUM: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 9), data.enumerated_type(), current_alignment); - break; - case eprosima::fastrtps::types::TK_BITMASK: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 10), data.bitmask_type(), current_alignment); - break; - default: - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 11), data.extended_type(), current_alignment); - break; - } - - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - - return calculated_size; - -#endif // FASTCDR_VERSION_MAJOR == 1 -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::MinimalTypeObject& data) -{ - scdr << data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - scdr << data.alias_type(); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - scdr << data.annotation_type(); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - scdr << data.struct_type(); - break; - case eprosima::fastrtps::types::TK_UNION: - scdr << data.union_type(); - break; - case eprosima::fastrtps::types::TK_BITSET: - scdr << data.bitset_type(); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - scdr << data.sequence_type(); - break; - case eprosima::fastrtps::types::TK_ARRAY: - scdr << data.array_type(); - break; - case eprosima::fastrtps::types::TK_MAP: - scdr << data.map_type(); - break; - case eprosima::fastrtps::types::TK_ENUM: - scdr << data.enumerated_type(); - break; - case eprosima::fastrtps::types::TK_BITMASK: - scdr << data.bitmask_type(); - break; - default: - scdr << data.extended_type(); - break; - } -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::MinimalTypeObject& data) -{ - dcdr >> data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::TK_ALIAS: - dcdr >> data.alias_type(); - break; - case eprosima::fastrtps::types::TK_ANNOTATION: - dcdr >> data.annotation_type(); - break; - case eprosima::fastrtps::types::TK_STRUCTURE: - dcdr >> data.struct_type(); - break; - case eprosima::fastrtps::types::TK_UNION: - dcdr >> data.union_type(); - break; - case eprosima::fastrtps::types::TK_BITSET: - dcdr >> data.bitset_type(); - break; - case eprosima::fastrtps::types::TK_SEQUENCE: - dcdr >> data.sequence_type(); - break; - case eprosima::fastrtps::types::TK_ARRAY: - dcdr >> data.array_type(); - break; - case eprosima::fastrtps::types::TK_MAP: - dcdr >> data.map_type(); - break; - case eprosima::fastrtps::types::TK_ENUM: - dcdr >> data.enumerated_type(); - break; - case eprosima::fastrtps::types::TK_BITMASK: - dcdr >> data.bitmask_type(); - break; - default: - dcdr >> data.extended_type(); - break; - } -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeObject& data, - size_t& current_alignment) -{ -#if FASTCDR_VERSION_MAJOR == 1 - - size_t initial_alignment = current_alignment; - - current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); - - switch (data._d()) - { - case eprosima::fastrtps::types::EK_COMPLETE: - calculate_serialized_size(calculator, data.complete(), current_alignment); - break; - case eprosima::fastrtps::types::EK_MINIMAL: - calculate_serialized_size(calculator, data.minimal(), current_alignment); - break; - default: - break; - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.field_seq().size(); ++a) + { + calculate_serialized_size(calculator, data.field_seq().at(a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data._d(), current_alignment); - - switch (data._d()) - { - case eprosima::fastrtps::types::EK_COMPLETE: calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.complete(), current_alignment); - break; - case eprosima::fastrtps::types::EK_MINIMAL: + 0), data.bitset_flags(), current_alignment); calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.minimal(), current_alignment); - break; - default: - break; - } - - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - - return calculated_size; - -#endif // FASTCDR_VERSION_MAJOR == 1 -} - -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeObject& data) -{ - scdr << data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::EK_COMPLETE: - scdr << data.complete(); - break; - case eprosima::fastrtps::types::EK_MINIMAL: - scdr << data.minimal(); - break; - default: - break; - } -} - -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeObject& data) -{ - dcdr >> data._d(); - - switch (data._d()) - { - case eprosima::fastrtps::types::EK_COMPLETE: - dcdr >> data.complete(); - break; - case eprosima::fastrtps::types::EK_MINIMAL: - dcdr >> data.minimal(); - break; - default: - break; - } -} - -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data, - size_t& current_alignment) -{ -#if FASTCDR_VERSION_MAJOR == 1 - - size_t initial_alignment = current_alignment; - - calculate_serialized_size(calculator, data.type_identifier(), current_alignment); - calculate_serialized_size(calculator, data.type_object(), current_alignment); + 1), data.header(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.field_seq(), current_alignment); + + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + + return calculated_size; + +#endif // FASTCDR_VERSION_MAJOR == 1 + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalBitsetType& data) + { +#if FASTCDR_VERSION_MAJOR == 1 + uint16_t bits = static_cast < uint16_t > (data.bitset_flags().bitset().to_ulong()); + scdr << bits; +#else + scdr << data.bitset_flags(); +#endif // FASTCDR_VERSION_MAJOR == 1 + scdr << data.header(); + scdr << data.field_seq(); + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalBitsetType& data) + { +#if FASTCDR_VERSION_MAJOR == 1 + uint16_t bits; + dcdr >> bits; + data.bitset_flags().bitset(std::bitset < 16 > (bits)); +#else + dcdr >> data.bitset_flags(); +#endif // FASTCDR_VERSION_MAJOR == 1 + dcdr >> data.header(); + dcdr >> data.field_seq(); + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator&, + const eprosima::fastrtps::types::CompleteExtendedType&, + size_t&) + { + return 0; + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr&, + const eprosima::fastrtps::types::CompleteExtendedType&) + { + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr&, + eprosima::fastrtps::types::CompleteExtendedType&) + { + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator&, + const eprosima::fastrtps::types::MinimalExtendedType&, + size_t&) + { + return 0; + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr&, + const eprosima::fastrtps::types::MinimalExtendedType&) + { + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr&, + eprosima::fastrtps::types::MinimalExtendedType&) + { + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::CompleteTypeObject& data, + size_t& current_alignment) + { +#if FASTCDR_VERSION_MAJOR == 1 + + size_t initial_alignment = current_alignment; + + current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + calculate_serialized_size(calculator, data.alias_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + calculate_serialized_size(calculator, data.annotation_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + calculate_serialized_size(calculator, data.struct_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_UNION: + calculate_serialized_size(calculator, data.union_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITSET: + calculate_serialized_size(calculator, data.bitset_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + calculate_serialized_size(calculator, data.sequence_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ARRAY: + calculate_serialized_size(calculator, data.array_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_MAP: + calculate_serialized_size(calculator, data.map_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ENUM: + calculate_serialized_size(calculator, data.enumerated_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITMASK: + calculate_serialized_size(calculator, data.bitmask_type(), current_alignment); + break; + default: + calculate_serialized_size(calculator, data.extended_type(), current_alignment); + break; + } + + return current_alignment - initial_alignment; + +#else + + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - return current_alignment - initial_alignment; + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data._d(), current_alignment); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.alias_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.annotation_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.struct_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_UNION: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 4), data.union_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITSET: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 5), data.bitset_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 6), data.sequence_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ARRAY: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 7), data.array_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_MAP: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 8), data.map_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ENUM: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 9), data.enumerated_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITMASK: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 10), data.bitmask_type(), current_alignment); + break; + default: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 11), data.extended_type(), current_alignment); + break; + } + + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + + return calculated_size; + +#endif // FASTCDR_VERSION_MAJOR == 1 + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::CompleteTypeObject& data) + { + scdr << data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + scdr << data.alias_type(); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + scdr << data.annotation_type(); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + scdr << data.struct_type(); + break; + case eprosima::fastrtps::types::TK_UNION: + scdr << data.union_type(); + break; + case eprosima::fastrtps::types::TK_BITSET: + scdr << data.bitset_type(); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + scdr << data.sequence_type(); + break; + case eprosima::fastrtps::types::TK_ARRAY: + scdr << data.array_type(); + break; + case eprosima::fastrtps::types::TK_MAP: + scdr << data.map_type(); + break; + case eprosima::fastrtps::types::TK_ENUM: + scdr << data.enumerated_type(); + break; + case eprosima::fastrtps::types::TK_BITMASK: + scdr << data.bitmask_type(); + break; + default: + scdr << data.extended_type(); + break; + } + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::CompleteTypeObject& data) + { + dcdr >> data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + dcdr >> data.alias_type(); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + dcdr >> data.annotation_type(); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + dcdr >> data.struct_type(); + break; + case eprosima::fastrtps::types::TK_UNION: + dcdr >> data.union_type(); + break; + case eprosima::fastrtps::types::TK_BITSET: + dcdr >> data.bitset_type(); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + dcdr >> data.sequence_type(); + break; + case eprosima::fastrtps::types::TK_ARRAY: + dcdr >> data.array_type(); + break; + case eprosima::fastrtps::types::TK_MAP: + dcdr >> data.map_type(); + break; + case eprosima::fastrtps::types::TK_ENUM: + dcdr >> data.enumerated_type(); + break; + case eprosima::fastrtps::types::TK_BITMASK: + dcdr >> data.bitmask_type(); + break; + default: + dcdr >> data.extended_type(); + break; + } + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::MinimalTypeObject& data, + size_t& current_alignment) + { +#if FASTCDR_VERSION_MAJOR == 1 + + size_t initial_alignment = current_alignment; + + current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + calculate_serialized_size(calculator, data.alias_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + calculate_serialized_size(calculator, data.annotation_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + calculate_serialized_size(calculator, data.struct_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_UNION: + calculate_serialized_size(calculator, data.union_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITSET: + calculate_serialized_size(calculator, data.bitset_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + calculate_serialized_size(calculator, data.sequence_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ARRAY: + calculate_serialized_size(calculator, data.array_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_MAP: + calculate_serialized_size(calculator, data.map_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ENUM: + calculate_serialized_size(calculator, data.enumerated_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITMASK: + calculate_serialized_size(calculator, data.bitmask_type(), current_alignment); + break; + default: + calculate_serialized_size(calculator, data.extended_type(), current_alignment); + break; + } + + return current_alignment - initial_alignment; + +#else + + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; -#else + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data._d(), current_alignment); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.alias_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.annotation_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 3), data.struct_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_UNION: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 4), data.union_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITSET: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 5), data.bitset_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 6), data.sequence_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ARRAY: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 7), data.array_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_MAP: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 8), data.map_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_ENUM: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 9), data.enumerated_type(), current_alignment); + break; + case eprosima::fastrtps::types::TK_BITMASK: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 10), data.bitmask_type(), current_alignment); + break; + default: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 11), data.extended_type(), current_alignment); + break; + } + + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + + return calculated_size; + +#endif // FASTCDR_VERSION_MAJOR == 1 + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::MinimalTypeObject& data) + { + scdr << data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + scdr << data.alias_type(); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + scdr << data.annotation_type(); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + scdr << data.struct_type(); + break; + case eprosima::fastrtps::types::TK_UNION: + scdr << data.union_type(); + break; + case eprosima::fastrtps::types::TK_BITSET: + scdr << data.bitset_type(); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + scdr << data.sequence_type(); + break; + case eprosima::fastrtps::types::TK_ARRAY: + scdr << data.array_type(); + break; + case eprosima::fastrtps::types::TK_MAP: + scdr << data.map_type(); + break; + case eprosima::fastrtps::types::TK_ENUM: + scdr << data.enumerated_type(); + break; + case eprosima::fastrtps::types::TK_BITMASK: + scdr << data.bitmask_type(); + break; + default: + scdr << data.extended_type(); + break; + } + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::MinimalTypeObject& data) + { + dcdr >> data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::TK_ALIAS: + dcdr >> data.alias_type(); + break; + case eprosima::fastrtps::types::TK_ANNOTATION: + dcdr >> data.annotation_type(); + break; + case eprosima::fastrtps::types::TK_STRUCTURE: + dcdr >> data.struct_type(); + break; + case eprosima::fastrtps::types::TK_UNION: + dcdr >> data.union_type(); + break; + case eprosima::fastrtps::types::TK_BITSET: + dcdr >> data.bitset_type(); + break; + case eprosima::fastrtps::types::TK_SEQUENCE: + dcdr >> data.sequence_type(); + break; + case eprosima::fastrtps::types::TK_ARRAY: + dcdr >> data.array_type(); + break; + case eprosima::fastrtps::types::TK_MAP: + dcdr >> data.map_type(); + break; + case eprosima::fastrtps::types::TK_ENUM: + dcdr >> data.enumerated_type(); + break; + case eprosima::fastrtps::types::TK_BITMASK: + dcdr >> data.bitmask_type(); + break; + default: + dcdr >> data.extended_type(); + break; + } + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeObject& data, + size_t& current_alignment) + { +#if FASTCDR_VERSION_MAJOR == 1 + + size_t initial_alignment = current_alignment; + + current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1); + + switch (data._d()) + { + case eprosima::fastrtps::types::EK_COMPLETE: + calculate_serialized_size(calculator, data.complete(), current_alignment); + break; + case eprosima::fastrtps::types::EK_MINIMAL: + calculate_serialized_size(calculator, data.minimal(), current_alignment); + break; + default: + break; + } + + return current_alignment - initial_alignment; + +#else + + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data._d(), current_alignment); + + switch (data._d()) + { + case eprosima::fastrtps::types::EK_COMPLETE: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.complete(), current_alignment); + break; + case eprosima::fastrtps::types::EK_MINIMAL: + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.minimal(), current_alignment); + break; + default: + break; + } + + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + + return calculated_size; + +#endif // FASTCDR_VERSION_MAJOR == 1 + } + + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeObject& data) + { + scdr << data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::EK_COMPLETE: + scdr << data.complete(); + break; + case eprosima::fastrtps::types::EK_MINIMAL: + scdr << data.minimal(); + break; + default: + break; + } + } + + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeObject& data) + { + dcdr >> data._d(); + + switch (data._d()) + { + case eprosima::fastrtps::types::EK_COMPLETE: + dcdr >> data.complete(); + break; + case eprosima::fastrtps::types::EK_MINIMAL: + dcdr >> data.minimal(); + break; + default: + break; + } + } + + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data, + size_t& current_alignment) + { +#if FASTCDR_VERSION_MAJOR == 1 + + size_t initial_alignment = current_alignment; + + calculate_serialized_size(calculator, data.type_identifier(), current_alignment); + calculate_serialized_size(calculator, data.type_object(), current_alignment); + + return current_alignment - initial_alignment; + +#else + + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.type_identifier(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.type_object(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.type_identifier(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.type_object(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data) -{ - scdr << data.type_identifier(); - scdr << data.type_object(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data) + { + scdr << data.type_identifier(); + scdr << data.type_object(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data) -{ - dcdr >> data.type_identifier(); - dcdr >> data.type_object(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeIdentifierTypeObjectPair& data) + { + dcdr >> data.type_identifier(); + dcdr >> data.type_object(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeIdentifierPair& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeIdentifierPair& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.type_identifier1(), current_alignment); - calculate_serialized_size(calculator, data.type_identifier2(), current_alignment); + calculate_serialized_size(calculator, data.type_identifier1(), current_alignment); + calculate_serialized_size(calculator, data.type_identifier2(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.type_identifier1(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.type_identifier2(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.type_identifier1(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.type_identifier2(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeIdentifierPair& data) -{ - scdr << data.type_identifier1(); - scdr << data.type_identifier2(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeIdentifierPair& data) + { + scdr << data.type_identifier1(); + scdr << data.type_identifier2(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeIdentifierPair& data) -{ - dcdr >> data.type_identifier1(); - dcdr >> data.type_identifier2(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeIdentifierPair& data) + { + dcdr >> data.type_identifier1(); + dcdr >> data.type_identifier2(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeIdentifierWithSize& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeIdentifierWithSize& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.type_id(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + calculate_serialized_size(calculator, data.type_id(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.type_id(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.typeobject_serialized_size(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.type_id(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.typeobject_serialized_size(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeIdentifierWithSize& data) -{ - scdr << data.type_id(); - scdr << data.typeobject_serialized_size(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeIdentifierWithSize& data) + { + scdr << data.type_id(); + scdr << data.typeobject_serialized_size(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeIdentifierWithSize& data) -{ - dcdr >> data.type_id(); - dcdr >> data.typeobject_serialized_size(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeIdentifierWithSize& data) + { + dcdr >> data.type_id(); + dcdr >> data.typeobject_serialized_size(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeIdentifierWithDependencies& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeIdentifierWithDependencies& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.typeid_with_size(), current_alignment); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + calculate_serialized_size(calculator, data.typeid_with_size(), current_alignment); + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); - for (size_t a = 0; a < data.dependent_typeids().size(); ++a) - { - calculate_serialized_size(calculator, data.dependent_typeids().at( - a), current_alignment); - } + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4); + for (size_t a = 0; a < data.dependent_typeids().size(); ++a) + { + calculate_serialized_size(calculator, data.dependent_typeids().at( + a), current_alignment); + } - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.typeid_with_size(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.dependent_typeid_count(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 2), data.dependent_typeids(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.typeid_with_size(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.dependent_typeid_count(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 2), data.dependent_typeids(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeIdentifierWithDependencies& data) -{ - scdr << data.typeid_with_size(); - scdr << data.dependent_typeid_count(); - scdr << data.dependent_typeids(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeIdentifierWithDependencies& data) + { + scdr << data.typeid_with_size(); + scdr << data.dependent_typeid_count(); + scdr << data.dependent_typeids(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeIdentifierWithDependencies& data) -{ - dcdr >> data.typeid_with_size(); - dcdr >> data.dependent_typeid_count(); - dcdr >> data.dependent_typeids(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeIdentifierWithDependencies& data) + { + dcdr >> data.typeid_with_size(); + dcdr >> data.dependent_typeid_count(); + dcdr >> data.dependent_typeids(); + } -template<> -RTPS_DllAPI size_t calculate_serialized_size( - eprosima::fastcdr::CdrSizeCalculator& calculator, - const eprosima::fastrtps::types::TypeInformation& data, - size_t& current_alignment) -{ + template < > + FASTDDS_EXPORTED_API size_t calculate_serialized_size( + eprosima::fastcdr::CdrSizeCalculator& calculator, + const eprosima::fastrtps::types::TypeInformation& data, + size_t& current_alignment) + { #if FASTCDR_VERSION_MAJOR == 1 - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - calculate_serialized_size(calculator, data.minimal(), current_alignment); - calculate_serialized_size(calculator, data.complete(), current_alignment); + calculate_serialized_size(calculator, data.minimal(), current_alignment); + calculate_serialized_size(calculator, data.complete(), current_alignment); - return current_alignment - initial_alignment; + return current_alignment - initial_alignment; #else - size_t calculated_size {calculator.begin_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment)}; + size_t calculated_size { + calculator.begin_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment) + }; - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 0), data.minimal(), current_alignment); - calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( - 1), data.complete(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 0), data.minimal(), current_alignment); + calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId( + 1), data.complete(), current_alignment); - calculated_size += calculator.end_calculate_type_serialized_size( - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); + calculated_size += calculator.end_calculate_type_serialized_size( + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2, current_alignment); - return calculated_size; + return calculated_size; #endif // FASTCDR_VERSION_MAJOR == 1 -} + } -template<> -RTPS_DllAPI void serialize( - eprosima::fastcdr::Cdr& scdr, - const eprosima::fastrtps::types::TypeInformation& data) -{ - scdr << data.minimal(); - scdr << data.complete(); -} + template < > + FASTDDS_EXPORTED_API void serialize( + eprosima::fastcdr::Cdr& scdr, + const eprosima::fastrtps::types::TypeInformation& data) + { + scdr << data.minimal(); + scdr << data.complete(); + } -template<> -RTPS_DllAPI void deserialize( - eprosima::fastcdr::Cdr& dcdr, - eprosima::fastrtps::types::TypeInformation& data) -{ - dcdr >> data.minimal(); - dcdr >> data.complete(); -} + template < > + FASTDDS_EXPORTED_API void deserialize( + eprosima::fastcdr::Cdr& dcdr, + eprosima::fastrtps::types::TypeInformation& data) + { + dcdr >> data.minimal(); + dcdr >> data.complete(); + } -} // namespace fastcdr + } // namespace fastcdr } // namespace eprosima #endif // DYNAMIC_TYPES_TYPEOBJECTCDRAUX_IPP diff --git a/src/cpp/fastdds/publisher/qos/PublisherQos.cpp b/src/cpp/fastdds/publisher/qos/PublisherQos.cpp index 43de23357ce..efee7c46332 100644 --- a/src/cpp/fastdds/publisher/qos/PublisherQos.cpp +++ b/src/cpp/fastdds/publisher/qos/PublisherQos.cpp @@ -24,7 +24,7 @@ namespace eprosima { namespace fastdds { namespace dds { -RTPS_DllAPI const PublisherQos PUBLISHER_QOS_DEFAULT; +FASTDDS_EXPORTED_API const PublisherQos PUBLISHER_QOS_DEFAULT; } /* namespace dds */ diff --git a/src/cpp/fastdds/publisher/qos/WriterQos.cpp b/src/cpp/fastdds/publisher/qos/WriterQos.cpp index 7ebbaea962e..3bf221cc905 100644 --- a/src/cpp/fastdds/publisher/qos/WriterQos.cpp +++ b/src/cpp/fastdds/publisher/qos/WriterQos.cpp @@ -27,7 +27,7 @@ namespace eprosima { namespace fastdds { namespace dds { -//RTPS_DllAPI const WriterQos DATAWRITER_QOS_DEFAULT; +//FASTDDS_EXPORTED_API const WriterQos DATAWRITER_QOS_DEFAULT; WriterQos::WriterQos() { diff --git a/src/cpp/fastdds/subscriber/qos/SubscriberQos.cpp b/src/cpp/fastdds/subscriber/qos/SubscriberQos.cpp index 67b5dc2e8c3..732d649a16e 100644 --- a/src/cpp/fastdds/subscriber/qos/SubscriberQos.cpp +++ b/src/cpp/fastdds/subscriber/qos/SubscriberQos.cpp @@ -24,7 +24,7 @@ namespace eprosima { namespace fastdds { namespace dds { -RTPS_DllAPI const SubscriberQos SUBSCRIBER_QOS_DEFAULT; +FASTDDS_EXPORTED_API const SubscriberQos SUBSCRIBER_QOS_DEFAULT; } /* namespace dds */ } /* namespace fastdds */ diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp index ea98abdd27a..46fd15b1344 100644 --- a/src/cpp/fastdds/topic/TopicDataType.cpp +++ b/src/cpp/fastdds/topic/TopicDataType.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace eprosima { diff --git a/src/cpp/fastrtps.rc b/src/cpp/fastrtps.rc index 74e13bab86e..621ab1fac9a 100644 --- a/src/cpp/fastrtps.rc +++ b/src/cpp/fastrtps.rc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #define VC_EXTRALEAN #define WIN32_LEAN_AND_MEAN @@ -53,18 +53,18 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/src/cpp/rtps/transport/TCPv4Transport.h b/src/cpp/rtps/transport/TCPv4Transport.h index 8dca1b8b085..86c41004be9 100644 --- a/src/cpp/rtps/transport/TCPv4Transport.h +++ b/src/cpp/rtps/transport/TCPv4Transport.h @@ -122,7 +122,7 @@ class TCPv4Transport : public TCPTransportInterface public: - RTPS_DllAPI TCPv4Transport( + FASTDDS_EXPORTED_API TCPv4Transport( const TCPv4TransportDescriptor&); virtual ~TCPv4Transport() override; diff --git a/src/cpp/rtps/transport/TCPv6Transport.h b/src/cpp/rtps/transport/TCPv6Transport.h index a33b4f5453d..e54de0e956f 100644 --- a/src/cpp/rtps/transport/TCPv6Transport.h +++ b/src/cpp/rtps/transport/TCPv6Transport.h @@ -129,7 +129,7 @@ class TCPv6Transport : public TCPTransportInterface public: - RTPS_DllAPI TCPv6Transport( + FASTDDS_EXPORTED_API TCPv6Transport( const TCPv6TransportDescriptor&); virtual ~TCPv6Transport() override; diff --git a/src/cpp/rtps/transport/UDPv4Transport.h b/src/cpp/rtps/transport/UDPv4Transport.h index 3355ec599d8..69b22b1b163 100644 --- a/src/cpp/rtps/transport/UDPv4Transport.h +++ b/src/cpp/rtps/transport/UDPv4Transport.h @@ -43,7 +43,7 @@ class UDPv4Transport : public UDPTransportInterface { public: - RTPS_DllAPI UDPv4Transport( + FASTDDS_EXPORTED_API UDPv4Transport( const UDPv4TransportDescriptor&); ~UDPv4Transport() override; diff --git a/src/cpp/rtps/transport/UDPv6Transport.h b/src/cpp/rtps/transport/UDPv6Transport.h index adf2b9fce0f..67fdf116845 100644 --- a/src/cpp/rtps/transport/UDPv6Transport.h +++ b/src/cpp/rtps/transport/UDPv6Transport.h @@ -43,7 +43,7 @@ class UDPv6Transport : public UDPTransportInterface { public: - RTPS_DllAPI UDPv6Transport( + FASTDDS_EXPORTED_API UDPv6Transport( const UDPv6TransportDescriptor&); ~UDPv6Transport() override; diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h index 2b2989908c9..f1262aba62d 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h +++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h @@ -45,7 +45,7 @@ class SharedMemTransport : public TransportInterface { public: - RTPS_DllAPI SharedMemTransport( + FASTDDS_EXPORTED_API SharedMemTransport( const SharedMemTransportDescriptor&); const SharedMemTransportDescriptor* configuration() const; diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h index 0b60063fd52..1188d0f112b 100644 --- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h +++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h @@ -26,7 +26,7 @@ class test_SharedMemTransport : public SharedMemTransport { public: - RTPS_DllAPI test_SharedMemTransport( + FASTDDS_EXPORTED_API test_SharedMemTransport( const test_SharedMemTransportDescriptor&); bool send( diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h index 1e1cfe03b8d..f0576c700d4 100644 --- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h +++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h @@ -28,10 +28,12 @@ namespace rtps { */ typedef struct test_SharedMemTransportDescriptor : public SharedMemTransportDescriptor { - virtual ~test_SharedMemTransportDescriptor() {} + virtual ~test_SharedMemTransportDescriptor() + { + } - RTPS_DllAPI test_SharedMemTransportDescriptor(); - RTPS_DllAPI test_SharedMemTransportDescriptor( + FASTDDS_EXPORTED_API test_SharedMemTransportDescriptor(); + FASTDDS_EXPORTED_API test_SharedMemTransportDescriptor( const test_SharedMemTransportDescriptor& t); virtual TransportInterface* create_transport() const override; diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h index 9ef1df6398d..8bf175f1816 100644 --- a/src/cpp/rtps/transport/test_UDPv4Transport.h +++ b/src/cpp/rtps/transport/test_UDPv4Transport.h @@ -53,14 +53,14 @@ class test_UDPv4Transport : public UDPv4Transport virtual LocatorList NormalizeLocator( const Locator& locator) override; - RTPS_DllAPI static std::atomic test_UDPv4Transport_ShutdownAllNetwork; + FASTDDS_EXPORTED_API static std::atomic test_UDPv4Transport_ShutdownAllNetwork; // Handle to a persistent log of dropped packets. Defaults to length 0 (no logging) to prevent wasted resources. - RTPS_DllAPI static std::vector> test_UDPv4Transport_DropLog; - RTPS_DllAPI static std::atomic test_UDPv4Transport_DropLogLength; - RTPS_DllAPI static std::atomic always_drop_participant_builtin_topic_data; - RTPS_DllAPI static std::atomic simulate_no_interfaces; + FASTDDS_EXPORTED_API static std::vector> test_UDPv4Transport_DropLog; + FASTDDS_EXPORTED_API static std::atomic test_UDPv4Transport_DropLogLength; + FASTDDS_EXPORTED_API static std::atomic always_drop_participant_builtin_topic_data; + FASTDDS_EXPORTED_API static std::atomic simulate_no_interfaces; - RTPS_DllAPI static test_UDPv4TransportDescriptor::DestinationLocatorFilter locator_filter; + FASTDDS_EXPORTED_API static test_UDPv4TransportDescriptor::DestinationLocatorFilter locator_filter; protected: diff --git a/src/cpp/statistics/rtps/StatisticsBase.hpp b/src/cpp/statistics/rtps/StatisticsBase.hpp index a563de76d5e..70f2201fd34 100644 --- a/src/cpp/statistics/rtps/StatisticsBase.hpp +++ b/src/cpp/statistics/rtps/StatisticsBase.hpp @@ -460,13 +460,13 @@ class StatisticsParticipantImpl // auxiliary conversion functions // TODO(jlbueno): private headers shall not export API -RTPS_DllAPI detail::Locator_s to_statistics_type(fastrtps::rtps::Locator_t); -RTPS_DllAPI fastrtps::rtps::Locator_t to_fastdds_type( +FASTDDS_EXPORTED_API detail::Locator_s to_statistics_type(fastrtps::rtps::Locator_t); +FASTDDS_EXPORTED_API fastrtps::rtps::Locator_t to_fastdds_type( detail::Locator_s); -RTPS_DllAPI detail::GUID_s to_statistics_type(fastrtps::rtps::GUID_t); -RTPS_DllAPI fastrtps::rtps::GUID_t to_fastdds_type( +FASTDDS_EXPORTED_API detail::GUID_s to_statistics_type(fastrtps::rtps::GUID_t); +FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t to_fastdds_type( detail::GUID_s); -RTPS_DllAPI detail::SampleIdentity_s to_statistics_type(fastrtps::rtps::SampleIdentity); +FASTDDS_EXPORTED_API detail::SampleIdentity_s to_statistics_type(fastrtps::rtps::SampleIdentity); #else // dummy implementation diff --git a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp index 035109c9fb7..2dcaf1d265a 100644 --- a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp +++ b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp @@ -171,14 +171,14 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI DurabilityQosPolicy() + FASTDDS_EXPORTED_API DurabilityQosPolicy() : Parameter_t(PID_DURABILITY, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(VOLATILE_DURABILITY_QOS) { } - virtual RTPS_DllAPI ~DurabilityQosPolicy() + virtual FASTDDS_EXPORTED_API ~DurabilityQosPolicy() { } @@ -235,14 +235,14 @@ class DeadlineQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI DeadlineQosPolicy() + FASTDDS_EXPORTED_API DeadlineQosPolicy() : Parameter_t(PID_DEADLINE, PARAMETER_TIME_LENGTH) , QosPolicy(true) , period(TIME_T_INFINITE_SECONDS, TIME_T_INFINITE_NANOSECONDS) { } - virtual RTPS_DllAPI ~DeadlineQosPolicy() + virtual FASTDDS_EXPORTED_API ~DeadlineQosPolicy() { } @@ -266,14 +266,14 @@ class LatencyBudgetQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI LatencyBudgetQosPolicy() + FASTDDS_EXPORTED_API LatencyBudgetQosPolicy() : Parameter_t(PID_LATENCY_BUDGET, PARAMETER_TIME_LENGTH) , QosPolicy(true) , duration(0, 0) { } - virtual RTPS_DllAPI ~LatencyBudgetQosPolicy() + virtual FASTDDS_EXPORTED_API ~LatencyBudgetQosPolicy() { } @@ -312,7 +312,7 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI LivelinessQosPolicy() + FASTDDS_EXPORTED_API LivelinessQosPolicy() : Parameter_t(PID_LIVELINESS, PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) , QosPolicy(true) , kind(AUTOMATIC_LIVELINESS_QOS) @@ -321,7 +321,7 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy announcement_period = fastrtps::c_TimeInfinite; } - virtual RTPS_DllAPI ~LivelinessQosPolicy() + virtual FASTDDS_EXPORTED_API ~LivelinessQosPolicy() { } @@ -356,7 +356,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI ReliabilityQosPolicy() + FASTDDS_EXPORTED_API ReliabilityQosPolicy() : Parameter_t(PID_RELIABILITY, PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) , QosPolicy(true) , //indicate send always @@ -366,7 +366,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~ReliabilityQosPolicy() + virtual FASTDDS_EXPORTED_API ~ReliabilityQosPolicy() { } @@ -401,14 +401,14 @@ class OwnershipQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI OwnershipQosPolicy() + FASTDDS_EXPORTED_API OwnershipQosPolicy() : Parameter_t(PID_OWNERSHIP, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(SHARED_OWNERSHIP_QOS) { } - virtual RTPS_DllAPI ~OwnershipQosPolicy() + virtual FASTDDS_EXPORTED_API ~OwnershipQosPolicy() { } @@ -444,14 +444,14 @@ class DestinationOrderQosPolicy : public Parameter_t, public QosPolicy public: DestinationOrderQosPolicyKind kind; - RTPS_DllAPI DestinationOrderQosPolicy() + FASTDDS_EXPORTED_API DestinationOrderQosPolicy() : Parameter_t(PID_DESTINATION_ORDER, PARAMETER_KIND_LENGTH) , QosPolicy(true) , kind(BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS) { } - virtual RTPS_DllAPI ~DestinationOrderQosPolicy() + virtual FASTDDS_EXPORTED_API ~DestinationOrderQosPolicy() { } @@ -473,7 +473,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, public: - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid) : Parameter_t(pid, 0) , QosPolicy(false) @@ -481,7 +481,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { } - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid, uint16_t in_length) : Parameter_t(pid, in_length) @@ -498,7 +498,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * * @param data data to copy in the newly created object */ - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( const GenericDataQosPolicy& data) : Parameter_t(data.Pid, data.length) , QosPolicy(false) @@ -515,7 +515,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * @param pid Id of the parameter * @param data data to copy in the newly created object */ - RTPS_DllAPI GenericDataQosPolicy( + FASTDDS_EXPORTED_API GenericDataQosPolicy( ParameterId_t pid, const collection_type& data) : Parameter_t(pid, 0) @@ -526,7 +526,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, length = static_cast((size() + 7u) & ~3u); } - virtual RTPS_DllAPI ~GenericDataQosPolicy() + virtual FASTDDS_EXPORTED_API ~GenericDataQosPolicy() { } @@ -625,7 +625,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * Returns raw data vector. * @return raw data as vector of octets. * */ - RTPS_DllAPI inline const collection_type& data_vec() const + FASTDDS_EXPORTED_API inline const collection_type& data_vec() const { return collection_; } @@ -634,7 +634,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * Sets raw data vector. * @param vec raw data to set. * */ - RTPS_DllAPI inline void data_vec( + FASTDDS_EXPORTED_API inline void data_vec( const collection_type& vec) { assign(vec.begin(), vec.end()); @@ -644,7 +644,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * Returns raw data vector. * @return raw data as vector of octets. * */ - RTPS_DllAPI inline const collection_type& getValue() const + FASTDDS_EXPORTED_API inline const collection_type& getValue() const { return collection_; } @@ -653,7 +653,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * Sets raw data vector. * @param vec raw data to set. * */ - RTPS_DllAPI inline void setValue( + FASTDDS_EXPORTED_API inline void setValue( const collection_type& vec) { assign(vec.begin(), vec.end()); @@ -669,12 +669,12 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { \ public: \ \ - RTPS_DllAPI TClassName() \ + FASTDDS_EXPORTED_API TClassName() \ : GenericDataQosPolicy(TPid) \ { \ } \ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ uint16_t in_length) \ : GenericDataQosPolicy(TPid, in_length) \ { \ @@ -688,7 +688,7 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * \ * @param data data to copy in the newly created object \ */ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ const TClassName& data) = default; \ \ /** \ @@ -699,13 +699,13 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, * \ * @param data data to copy in the newly created object \ */ \ - RTPS_DllAPI TClassName( \ + FASTDDS_EXPORTED_API TClassName( \ const collection_type& data) \ : GenericDataQosPolicy(TPid, data) \ { \ } \ \ - virtual RTPS_DllAPI ~TClassName() = default; \ + virtual FASTDDS_EXPORTED_API ~TClassName() = default; \ \ /** \ * Copies another TClassName. \ @@ -736,14 +736,14 @@ class TimeBasedFilterQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI TimeBasedFilterQosPolicy() + FASTDDS_EXPORTED_API TimeBasedFilterQosPolicy() : Parameter_t(PID_TIME_BASED_FILTER, PARAMETER_TIME_LENGTH) , QosPolicy(false) , minimum_separation(0, 0) { } - virtual RTPS_DllAPI ~TimeBasedFilterQosPolicy() + virtual FASTDDS_EXPORTED_API ~TimeBasedFilterQosPolicy() { } @@ -784,7 +784,7 @@ class PresentationQosPolicy : public Parameter_t, public QosPolicy PresentationQosPolicyAccessScopeKind access_scope; bool coherent_access; bool ordered_access; - RTPS_DllAPI PresentationQosPolicy() + FASTDDS_EXPORTED_API PresentationQosPolicy() : Parameter_t(PID_PRESENTATION, PARAMETER_PRESENTATION_LENGTH) , QosPolicy(false) , access_scope(INSTANCE_PRESENTATION_QOS) @@ -793,7 +793,7 @@ class PresentationQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~PresentationQosPolicy() + virtual FASTDDS_EXPORTED_API ~PresentationQosPolicy() { } @@ -816,13 +816,13 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI PartitionQosPolicy() + FASTDDS_EXPORTED_API PartitionQosPolicy() : Parameter_t(PID_PARTITION, 0) , QosPolicy(false) { } - RTPS_DllAPI PartitionQosPolicy( + FASTDDS_EXPORTED_API PartitionQosPolicy( uint16_t in_length) : Parameter_t(PID_PARTITION, in_length) , QosPolicy(false) @@ -830,7 +830,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~PartitionQosPolicy() + virtual FASTDDS_EXPORTED_API ~PartitionQosPolicy() { } @@ -849,7 +849,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * Appends a name to the list of partition names. * @param name Name to append. */ - RTPS_DllAPI inline void push_back( + FASTDDS_EXPORTED_API inline void push_back( const char* name) { names_.push_back(std::string(name)); hasChanged = true; @@ -858,7 +858,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * Clears list of partition names */ - RTPS_DllAPI inline void clear() override + FASTDDS_EXPORTED_API inline void clear() override { names_.clear(); } @@ -867,7 +867,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * Returns partition names. * @return Vector of partition name strings. */ - RTPS_DllAPI inline std::vector names() const + FASTDDS_EXPORTED_API inline std::vector names() const { return names_; } @@ -876,7 +876,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * Overrides partition names * @param nam Vector of partition name strings. */ - RTPS_DllAPI inline void names( + FASTDDS_EXPORTED_API inline void names( std::vector& nam) { names_ = nam; hasChanged = true; @@ -886,7 +886,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * Returns partition names. * @return Vector of partition name strings. */ - RTPS_DllAPI inline const std::vector getNames() const + FASTDDS_EXPORTED_API inline const std::vector getNames() const { return names(); } @@ -895,7 +895,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * Overrides partition names * @param nam Vector of partition name strings. */ - RTPS_DllAPI inline void setNames( + FASTDDS_EXPORTED_API inline void setNames( std::vector& nam) { names(nam); @@ -929,7 +929,7 @@ class HistoryQosPolicy : public Parameter_t, public QosPolicy HistoryQosPolicyKind kind; int32_t depth; - RTPS_DllAPI HistoryQosPolicy() + FASTDDS_EXPORTED_API HistoryQosPolicy() : Parameter_t(PID_HISTORY, PARAMETER_KIND_LENGTH + 4) , QosPolicy(true) , kind(KEEP_LAST_HISTORY_QOS) @@ -937,7 +937,7 @@ class HistoryQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~HistoryQosPolicy() + virtual FASTDDS_EXPORTED_API ~HistoryQosPolicy() { } @@ -966,7 +966,7 @@ class ResourceLimitsQosPolicy : public Parameter_t, public QosPolicy int32_t max_instances; int32_t max_samples_per_instance; int32_t allocated_samples; - RTPS_DllAPI ResourceLimitsQosPolicy() + FASTDDS_EXPORTED_API ResourceLimitsQosPolicy() : Parameter_t(PID_RESOURCE_LIMITS, 4 + 4 + 4) , QosPolicy(false) , max_samples(5000) @@ -976,7 +976,7 @@ class ResourceLimitsQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~ResourceLimitsQosPolicy() + virtual FASTDDS_EXPORTED_API ~ResourceLimitsQosPolicy() { } @@ -1012,7 +1012,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy int32_t max_samples; int32_t max_instances; int32_t max_samples_per_instance; - RTPS_DllAPI DurabilityServiceQosPolicy() + FASTDDS_EXPORTED_API DurabilityServiceQosPolicy() : Parameter_t(PID_DURABILITY_SERVICE, PARAMETER_TIME_LENGTH + PARAMETER_KIND_LENGTH + 4 + 4 + 4 + 4) , QosPolicy(false) , history_kind(KEEP_LAST_HISTORY_QOS) @@ -1023,7 +1023,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy { } - virtual RTPS_DllAPI ~DurabilityServiceQosPolicy() + virtual FASTDDS_EXPORTED_API ~DurabilityServiceQosPolicy() { } @@ -1046,14 +1046,14 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI LifespanQosPolicy() + FASTDDS_EXPORTED_API LifespanQosPolicy() : Parameter_t(PID_LIFESPAN, PARAMETER_TIME_LENGTH) , QosPolicy(true) , duration(fastrtps::c_TimeInfinite) { } - virtual RTPS_DllAPI ~LifespanQosPolicy() + virtual FASTDDS_EXPORTED_API ~LifespanQosPolicy() { } @@ -1077,14 +1077,14 @@ class OwnershipStrengthQosPolicy : public Parameter_t, public QosPolicy public: uint32_t value; - RTPS_DllAPI OwnershipStrengthQosPolicy() + FASTDDS_EXPORTED_API OwnershipStrengthQosPolicy() : Parameter_t(PID_OWNERSHIP_STRENGTH, 4) , QosPolicy(false) , value(0) { } - virtual RTPS_DllAPI ~OwnershipStrengthQosPolicy() + virtual FASTDDS_EXPORTED_API ~OwnershipStrengthQosPolicy() { } @@ -1110,14 +1110,14 @@ class TransportPriorityQosPolicy : public Parameter_t, public QosPolicy public: uint32_t value; - RTPS_DllAPI TransportPriorityQosPolicy() + FASTDDS_EXPORTED_API TransportPriorityQosPolicy() : Parameter_t(PID_TRANSPORT_PRIORITY, 4) , QosPolicy(false) , value(0) { } - virtual RTPS_DllAPI ~TransportPriorityQosPolicy() + virtual FASTDDS_EXPORTED_API ~TransportPriorityQosPolicy() { } @@ -1147,12 +1147,12 @@ class PublishModeQosPolicy : public QosPolicy public: PublishModeQosPolicyKind kind; - RTPS_DllAPI PublishModeQosPolicy() + FASTDDS_EXPORTED_API PublishModeQosPolicy() : kind(SYNCHRONOUS_PUBLISH_MODE) { } - virtual RTPS_DllAPI ~PublishModeQosPolicy() + virtual FASTDDS_EXPORTED_API ~PublishModeQosPolicy() { } @@ -1190,11 +1190,11 @@ class DataRepresentationQosPolicy : public Parameter_t, public QosPolicy public: std::vector m_value; - RTPS_DllAPI DataRepresentationQosPolicy() + FASTDDS_EXPORTED_API DataRepresentationQosPolicy() { } - virtual RTPS_DllAPI ~DataRepresentationQosPolicy() + virtual FASTDDS_EXPORTED_API ~DataRepresentationQosPolicy() { } @@ -1228,7 +1228,7 @@ class TypeConsistencyEnforcementQosPolicy : public Parameter_t, public QosPolicy bool m_prevent_type_widening; bool m_force_type_validation; - RTPS_DllAPI TypeConsistencyEnforcementQosPolicy() + FASTDDS_EXPORTED_API TypeConsistencyEnforcementQosPolicy() { m_kind = ALLOW_TYPE_COERCION; m_ignore_sequence_bounds = true; @@ -1238,7 +1238,7 @@ class TypeConsistencyEnforcementQosPolicy : public Parameter_t, public QosPolicy m_force_type_validation = false; } - virtual RTPS_DllAPI ~TypeConsistencyEnforcementQosPolicy() + virtual FASTDDS_EXPORTED_API ~TypeConsistencyEnforcementQosPolicy() { } @@ -1260,11 +1260,11 @@ class DisablePositiveACKsQosPolicy : public Parameter_t, public QosPolicy public: - RTPS_DllAPI DisablePositiveACKsQosPolicy() + FASTDDS_EXPORTED_API DisablePositiveACKsQosPolicy() { } - virtual RTPS_DllAPI ~DisablePositiveACKsQosPolicy() + virtual FASTDDS_EXPORTED_API ~DisablePositiveACKsQosPolicy() { } @@ -1304,19 +1304,19 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy { public: - RTPS_DllAPI DataSharingQosPolicy() + FASTDDS_EXPORTED_API DataSharingQosPolicy() : Parameter_t(PID_DATASHARING, 0) , QosPolicy(true) { domain_ids_.push_back(1); } - virtual RTPS_DllAPI ~DataSharingQosPolicy() = default; + virtual FASTDDS_EXPORTED_API ~DataSharingQosPolicy() = default; - RTPS_DllAPI DataSharingQosPolicy( + FASTDDS_EXPORTED_API DataSharingQosPolicy( const DataSharingQosPolicy& b) = default; - RTPS_DllAPI DataSharingQosPolicy& operator =( + FASTDDS_EXPORTED_API DataSharingQosPolicy& operator =( const DataSharingQosPolicy& b) = default; bool operator ==( @@ -1400,7 +1400,7 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy /** * @brief Configures the DataSharing in disabled mode */ - RTPS_DllAPI void off() + FASTDDS_EXPORTED_API void off() { kind_ = OFF; shm_directory_ = "directory"; @@ -1424,28 +1424,28 @@ class TypeIdV1 : public Parameter_t, public QosPolicy public: - RTPS_DllAPI TypeIdV1() + FASTDDS_EXPORTED_API TypeIdV1() : Parameter_t(PID_TYPE_IDV1, 0) , QosPolicy(false) { //m_type_identifier->_d(EK_MINIMAL); } - RTPS_DllAPI TypeIdV1( + FASTDDS_EXPORTED_API TypeIdV1( const TypeIdV1& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeIdV1( + FASTDDS_EXPORTED_API TypeIdV1( TypeIdV1&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeIdV1& operator =( + FASTDDS_EXPORTED_API TypeIdV1& operator =( const TypeIdV1& type) { Pid = type.Pid; @@ -1455,7 +1455,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy return *this; } - RTPS_DllAPI TypeIdV1& operator =( + FASTDDS_EXPORTED_API TypeIdV1& operator =( TypeIdV1&& type) { Pid = type.Pid; @@ -1465,7 +1465,7 @@ class TypeIdV1 : public Parameter_t, public QosPolicy return *this; } - virtual RTPS_DllAPI ~TypeIdV1() + virtual FASTDDS_EXPORTED_API ~TypeIdV1() { } @@ -1486,27 +1486,27 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy public: - RTPS_DllAPI TypeObjectV1() + FASTDDS_EXPORTED_API TypeObjectV1() : Parameter_t(PID_TYPE_OBJECTV1, 0) , QosPolicy(false) { } - RTPS_DllAPI TypeObjectV1( + FASTDDS_EXPORTED_API TypeObjectV1( const TypeObjectV1& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeObjectV1( + FASTDDS_EXPORTED_API TypeObjectV1( TypeObjectV1&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeObjectV1& operator =( + FASTDDS_EXPORTED_API TypeObjectV1& operator =( const TypeObjectV1& type) { Pid = type.Pid; @@ -1516,7 +1516,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy return *this; } - RTPS_DllAPI TypeObjectV1& operator =( + FASTDDS_EXPORTED_API TypeObjectV1& operator =( TypeObjectV1&& type) { Pid = type.Pid; @@ -1526,7 +1526,7 @@ class TypeObjectV1 : public Parameter_t, public QosPolicy return *this; } - virtual RTPS_DllAPI ~TypeObjectV1() + virtual FASTDDS_EXPORTED_API ~TypeObjectV1() { } @@ -1548,39 +1548,39 @@ class TypeInformation : public Parameter_t, public QosPolicy { public: - RTPS_DllAPI TypeInformation() + FASTDDS_EXPORTED_API TypeInformation() : Parameter_t(PID_TYPE_INFORMATION, 0) , QosPolicy(false) { } - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( const TypeInformation& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeInformation( + FASTDDS_EXPORTED_API TypeInformation( TypeInformation&& type) : Parameter_t(type.Pid, type.length) , QosPolicy(type.m_sendAlways) { } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( const TypeInformation&) { return *this; } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( TypeInformation&&) { return *this; } - virtual RTPS_DllAPI ~TypeInformation() override + virtual FASTDDS_EXPORTED_API ~TypeInformation() override { } @@ -1590,18 +1590,18 @@ class TypeInformation : public Parameter_t, public QosPolicy std::swap(*this, reset); } - RTPS_DllAPI bool isAssigned() const + FASTDDS_EXPORTED_API bool isAssigned() const { return true; } - RTPS_DllAPI TypeInformation& operator =( + FASTDDS_EXPORTED_API TypeInformation& operator =( const types::TypeInformation&) { return *this; } - RTPS_DllAPI const types::TypeInformation* get() const + FASTDDS_EXPORTED_API const types::TypeInformation* get() const { return nullptr; } diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h index ce45383e550..93d21dd5ef0 100644 --- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h +++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace eprosima { @@ -73,7 +73,7 @@ class WLP; * @brief Class RTPSParticipant, contains the public API for a RTPSParticipant. * @ingroup RTPS_MODULE */ -class RTPS_DllAPI RTPSParticipant +class FASTDDS_EXPORTED_API RTPSParticipant { friend class RTPSParticipantImpl; friend class RTPSDomain; diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h index 21a52181693..fcc6ab17f96 100644 --- a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h +++ b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include namespace eprosima { namespace fastdds { @@ -555,7 +555,7 @@ class RTPSParticipantAttributes //! Optionally allows user to define the GuidPrefix_t GuidPrefix_t prefix; - RTPS_DllAPI inline bool ReadguidPrefix( + FASTDDS_EXPORTED_API inline bool ReadguidPrefix( const char* pfx) { return bool(std::istringstream(pfx) >> prefix); diff --git a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h index cdf46a6c07d..7b4d6b96d24 100644 --- a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h +++ b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h @@ -346,24 +346,24 @@ class ReaderProxyData return m_userDefinedId; } - RTPS_DllAPI void content_filter( + FASTDDS_EXPORTED_API void content_filter( const fastdds::rtps::ContentFilterProperty& filter) { content_filter_ = filter; } - RTPS_DllAPI void content_filter( + FASTDDS_EXPORTED_API void content_filter( fastdds::rtps::ContentFilterProperty&& filter) { content_filter_ = std::move(filter); } - RTPS_DllAPI const fastdds::rtps::ContentFilterProperty& content_filter() const + FASTDDS_EXPORTED_API const fastdds::rtps::ContentFilterProperty& content_filter() const { return content_filter_; } - RTPS_DllAPI fastdds::rtps::ContentFilterProperty& content_filter() + FASTDDS_EXPORTED_API fastdds::rtps::ContentFilterProperty& content_filter() { return content_filter_; } diff --git a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h index 21795787fff..828471ea89f 100644 --- a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h +++ b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h @@ -39,7 +39,7 @@ typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescripto } - RTPS_DllAPI SharedMemTransportDescriptor() + FASTDDS_EXPORTED_API SharedMemTransportDescriptor() : PortBasedTransportDescriptor(0, 0) { @@ -55,12 +55,12 @@ typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescripto return 0; } - RTPS_DllAPI uint32_t segment_size() const + FASTDDS_EXPORTED_API uint32_t segment_size() const { return segment_size_; } - RTPS_DllAPI void segment_size( + FASTDDS_EXPORTED_API void segment_size( uint32_t segment_size) { segment_size_ = segment_size; @@ -71,53 +71,53 @@ typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescripto return maxMessageSize; } - RTPS_DllAPI void max_message_size( + FASTDDS_EXPORTED_API void max_message_size( uint32_t max_message_size) { maxMessageSize = max_message_size; } - RTPS_DllAPI uint32_t port_queue_capacity() const + FASTDDS_EXPORTED_API uint32_t port_queue_capacity() const { return port_queue_capacity_; } - RTPS_DllAPI void port_queue_capacity( + FASTDDS_EXPORTED_API void port_queue_capacity( uint32_t port_queue_capacity) { port_queue_capacity_ = port_queue_capacity; } - RTPS_DllAPI uint32_t healthy_check_timeout_ms() const + FASTDDS_EXPORTED_API uint32_t healthy_check_timeout_ms() const { return healthy_check_timeout_ms_; } - RTPS_DllAPI void healthy_check_timeout_ms( + FASTDDS_EXPORTED_API void healthy_check_timeout_ms( uint32_t healthy_check_timeout_ms) { healthy_check_timeout_ms_ = healthy_check_timeout_ms; } - RTPS_DllAPI std::string rtps_dump_file() const + FASTDDS_EXPORTED_API std::string rtps_dump_file() const { return rtps_dump_file_; } - RTPS_DllAPI void rtps_dump_file( + FASTDDS_EXPORTED_API void rtps_dump_file( const std::string& rtps_dump_file) { rtps_dump_file_ = rtps_dump_file; } //! Return the thread settings for the transport dump thread - RTPS_DllAPI ThreadSettings dump_thread() const + FASTDDS_EXPORTED_API ThreadSettings dump_thread() const { return dump_thread_; } //! Set the thread settings for the transport dump thread - RTPS_DllAPI void dump_thread( + FASTDDS_EXPORTED_API void dump_thread( const ThreadSettings& dump_thread) { dump_thread_ = dump_thread; diff --git a/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h b/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h index 13cf6d14e7f..a76792da91e 100644 --- a/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h +++ b/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h @@ -187,13 +187,13 @@ typedef struct TCPTransportDescriptor : public SocketTransportDescriptor listening_ports.push_back(port); } - RTPS_DllAPI TCPTransportDescriptor() + FASTDDS_EXPORTED_API TCPTransportDescriptor() : SocketTransportDescriptor(65550, 4) { } - RTPS_DllAPI TCPTransportDescriptor( + FASTDDS_EXPORTED_API TCPTransportDescriptor( const TCPTransportDescriptor& /*t*/) : SocketTransportDescriptor(65550, 4) { diff --git a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h index 89e266118a8..ae96df7f789 100644 --- a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h +++ b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h @@ -65,12 +65,12 @@ typedef struct TCPv4TransportDescriptor : public TCPTransportDescriptor wan_addr[3] = (eprosima::fastrtps::rtps::octet)d; } - RTPS_DllAPI TCPv4TransportDescriptor() + FASTDDS_EXPORTED_API TCPv4TransportDescriptor() { } - RTPS_DllAPI TCPv4TransportDescriptor( + FASTDDS_EXPORTED_API TCPv4TransportDescriptor( const TCPv4TransportDescriptor& /*t*/) : TCPv4TransportDescriptor() { diff --git a/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h b/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h index a14b9831b1a..16f76f8d514 100644 --- a/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h +++ b/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h @@ -44,12 +44,12 @@ typedef struct TCPv6TransportDescriptor : public TCPTransportDescriptor return nullptr; } - RTPS_DllAPI TCPv6TransportDescriptor() + FASTDDS_EXPORTED_API TCPv6TransportDescriptor() { } - RTPS_DllAPI TCPv6TransportDescriptor( + FASTDDS_EXPORTED_API TCPv6TransportDescriptor( const TCPv6TransportDescriptor& /*t*/) : TCPv6TransportDescriptor() { diff --git a/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h b/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h index 8a1a4b5716d..243cf2364f2 100644 --- a/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h +++ b/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h @@ -44,13 +44,13 @@ typedef struct UDPTransportDescriptor : public SocketTransportDescriptor return nullptr; } - RTPS_DllAPI UDPTransportDescriptor() + FASTDDS_EXPORTED_API UDPTransportDescriptor() : SocketTransportDescriptor(65550, 4) { } - RTPS_DllAPI UDPTransportDescriptor( + FASTDDS_EXPORTED_API UDPTransportDescriptor( const UDPTransportDescriptor& /*t*/) : SocketTransportDescriptor(65550, 4) { diff --git a/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h b/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h index 3b43924a4c4..bff26ea53e3 100644 --- a/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h +++ b/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h @@ -39,13 +39,13 @@ typedef struct UDPv4TransportDescriptor : public UDPTransportDescriptor { } - RTPS_DllAPI UDPv4TransportDescriptor() + FASTDDS_EXPORTED_API UDPv4TransportDescriptor() : UDPTransportDescriptor() { } - RTPS_DllAPI UDPv4TransportDescriptor( + FASTDDS_EXPORTED_API UDPv4TransportDescriptor( const UDPv4TransportDescriptor& /*t*/) : UDPTransportDescriptor() { diff --git a/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h b/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h index 2a2b25a0522..d774685e5e0 100644 --- a/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h +++ b/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h @@ -39,13 +39,13 @@ typedef struct UDPv6TransportDescriptor : public UDPTransportDescriptor { } - RTPS_DllAPI UDPv6TransportDescriptor() + FASTDDS_EXPORTED_API UDPv6TransportDescriptor() : UDPTransportDescriptor() { } - RTPS_DllAPI UDPv6TransportDescriptor( + FASTDDS_EXPORTED_API UDPv6TransportDescriptor( const UDPv6TransportDescriptor& /*t*/) : UDPTransportDescriptor() {