Skip to content

Commit

Permalink
Migrate fastrtps namespace (#813)
Browse files Browse the repository at this point in the history
* Refs #21129: Migrate fastrtps namespace to fastdds

Signed-off-by: elianalf <[email protected]>

* Refs #21129: Remove static from DiscoveryProtocol docs

Signed-off-by: elianalf <[email protected]>

* Refs #21129: Remove DiscoveryProtocol_t typedef

Signed-off-by: elianalf <[email protected]>

* Refs #21129: Remove typedef ParticipantFilteringFlags_t

Signed-off-by: elianalf <[email protected]>

---------

Signed-off-by: elianalf <[email protected]>
  • Loading branch information
elianalf authored Jun 18, 2024
1 parent 4e4d3ca commit 79416a6
Show file tree
Hide file tree
Showing 117 changed files with 547 additions and 550 deletions.
4 changes: 2 additions & 2 deletions code/CodeTester.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <fastdds/utils/IPLocator.h>

using namespace eprosima::fastdds::dds;
using namespace eprosima::fastrtps;
using namespace eprosima::fastdds;
using namespace ::rtps;

class HelloWorld
Expand Down Expand Up @@ -295,7 +295,7 @@ bool permissions_test(
std::string governance_file,
std::string permissions_file)
{
eprosima::fastrtps::rtps::RTPSParticipantAttributes part_attr;
eprosima::fastdds::rtps::RTPSParticipantAttributes part_attr;

// Activate Auth:PKI-DH plugin
part_attr.properties.properties().emplace_back("dds.sec.auth.plugin",
Expand Down
394 changes: 197 additions & 197 deletions code/DDSCodeTester.cpp

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include "HelloWorldCdrAux.hpp"
#include "HelloWorldTypeObjectSupport.hpp"

using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;

HelloWorldPubSubType::HelloWorldPubSubType()
Expand Down
8 changes: 4 additions & 4 deletions code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType

eProsima_user_DllExport bool serialize(
void* data,
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
{
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
}

eProsima_user_DllExport bool serialize(
void* data,
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
eprosima::fastdds::rtps::SerializedPayload_t* payload,
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;

eProsima_user_DllExport bool deserialize(
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
eprosima::fastdds::rtps::SerializedPayload_t* payload,
void* data) override;

eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
Expand All @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType

eProsima_user_DllExport bool getKey(
void* data,
eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
bool force_md5 = false) override;

eProsima_user_DllExport void* createData() override;
Expand Down
299 changes: 149 additions & 150 deletions docs/03-exports/aliases-api.include

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/fastdds/api_reference/rtps/Endpoint.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
Endpoint
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::Endpoint
.. doxygenclass:: eprosima::fastdds::rtps::Endpoint
:project: FastDDS
:members:
2 changes: 1 addition & 1 deletion docs/fastdds/api_reference/rtps/RTPSDomain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
RTPSDomain
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::RTPSDomain
.. doxygenclass:: eprosima::fastdds::rtps::RTPSDomain
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
BuiltinAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::BuiltinAttributes
.. doxygenclass:: eprosima::fastdds::rtps::BuiltinAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
DiscoveryProtocol
------------------------

.. doxygenenum:: eprosima::fastrtps::rtps::DiscoveryProtocol
.. doxygenenum:: eprosima::fastdds::rtps::DiscoveryProtocol
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
DiscoverySettings
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::DiscoverySettings
.. doxygenclass:: eprosima::fastdds::rtps::DiscoverySettings
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
EndpointAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::EndpointAttributes
.. doxygenclass:: eprosima::fastdds::rtps::EndpointAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
HistoryAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::HistoryAttributes
.. doxygenclass:: eprosima::fastdds::rtps::HistoryAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
InitialAnnouncementConfig
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::InitialAnnouncementConfig
.. doxygenstruct:: eprosima::fastdds::rtps::InitialAnnouncementConfig
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
ParticipantFilteringFlags
-----------------------------

.. doxygenenum:: eprosima::fastrtps::rtps::ParticipantFilteringFlags
.. doxygenenum:: eprosima::fastdds::rtps::ParticipantFilteringFlags
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
PropertyPolicy
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::PropertyPolicy
.. doxygenclass:: eprosima::fastdds::rtps::PropertyPolicy
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
PropertyPolicyHelper
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::PropertyPolicyHelper
.. doxygenclass:: eprosima::fastdds::rtps::PropertyPolicyHelper
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
RTPSParticipantAllocationAttributes
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::RTPSParticipantAllocationAttributes
.. doxygenstruct:: eprosima::fastdds::rtps::RTPSParticipantAllocationAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
RTPSParticipantAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::RTPSParticipantAttributes
.. doxygenclass:: eprosima::fastdds::rtps::RTPSParticipantAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
RTPSWriterPublishMode
------------------------

.. doxygenenum:: eprosima::fastrtps::rtps::RTPSWriterPublishMode
.. doxygenenum:: eprosima::fastdds::rtps::RTPSWriterPublishMode
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
ReaderAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::ReaderAttributes
.. doxygenclass:: eprosima::fastdds::rtps::ReaderAttributes
:project: FastDDS
:members:
2 changes: 1 addition & 1 deletion docs/fastdds/api_reference/rtps/attributes/ReaderTimes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
ReaderTimes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::ReaderTimes
.. doxygenclass:: eprosima::fastdds::rtps::ReaderTimes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
RemoteLocatorsAllocationAttributes
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::RemoteLocatorsAllocationAttributes
.. doxygenstruct:: eprosima::fastdds::rtps::RemoteLocatorsAllocationAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
SendBuffersAllocationAttributes
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::SendBuffersAllocationAttributes
.. doxygenstruct:: eprosima::fastdds::rtps::SendBuffersAllocationAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
SimpleEDPAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::SimpleEDPAttributes
.. doxygenclass:: eprosima::fastdds::rtps::SimpleEDPAttributes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
VariableLengthDataLimits
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::VariableLengthDataLimits
.. doxygenstruct:: eprosima::fastdds::rtps::VariableLengthDataLimits
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
WriterAttributes
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::WriterAttributes
.. doxygenclass:: eprosima::fastdds::rtps::WriterAttributes
:project: FastDDS
:members:
2 changes: 1 addition & 1 deletion docs/fastdds/api_reference/rtps/attributes/WriterTimes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
WriterTimes
------------------------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::WriterTimes
.. doxygenstruct:: eprosima::fastdds::rtps::WriterTimes
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
c_default_RTPSParticipantAllocationAttributes
----------------------------------------------------

.. doxygenvariable:: eprosima::fastrtps::rtps::c_default_RTPSParticipantAllocationAttributes
.. doxygenvariable:: eprosima::fastdds::rtps::c_default_RTPSParticipantAllocationAttributes
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
BinaryProperty
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::BinaryProperty
.. doxygenclass:: eprosima::fastdds::rtps::BinaryProperty
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
BinaryPropertyHelper
--------------------------------

.. doxygenclass:: eprosima::fastrtps::rtps::BinaryPropertyHelper
.. doxygenclass:: eprosima::fastdds::rtps::BinaryPropertyHelper
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
BinaryPropertySeq
--------------------------------

.. doxygentypedef:: eprosima::fastrtps::rtps::BinaryPropertySeq
.. doxygentypedef:: eprosima::fastdds::rtps::BinaryPropertySeq
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
CDRMessage_t
--------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::CDRMessage_t
.. doxygenstruct:: eprosima::fastdds::rtps::CDRMessage_t
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
CacheChange_t
--------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::CacheChange_t
.. doxygenstruct:: eprosima::fastdds::rtps::CacheChange_t
:project: FastDDS
:members:
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
ChangeKind_t
--------------------------------

.. doxygenenum:: eprosima::fastrtps::rtps::ChangeKind_t
.. doxygenenum:: eprosima::fastdds::rtps::ChangeKind_t
:project: FastDDS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
EntityId_t
--------------------------------

.. doxygenstruct:: eprosima::fastrtps::rtps::EntityId_t
.. doxygenstruct:: eprosima::fastdds::rtps::EntityId_t
:project: FastDDS
:members:
48 changes: 24 additions & 24 deletions docs/fastdds/api_reference/rtps/common/EntityId_t/const_values.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,75 @@
Const values
--------------------------------

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_Unknown
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_Unknown
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SPDPReader
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SPDPReader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SPDPWriter
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SPDPWriter
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SEDPPubWriter
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SEDPPubWriter
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SEDPPubReader
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SEDPPubReader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SEDPSubWriter
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SEDPSubWriter
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_SEDPSubReader
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_SEDPSubReader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_RTPSParticipant
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_RTPSParticipant
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_WriterLiveliness
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_WriterLiveliness
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_ReaderLiveliness
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_ReaderLiveliness
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::participant_stateless_message_writer_entity_id
.. doxygenvariable:: eprosima::fastdds::rtps::participant_stateless_message_writer_entity_id
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::participant_stateless_message_reader_entity_id
.. doxygenvariable:: eprosima::fastdds::rtps::participant_stateless_message_reader_entity_id
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_TypeLookup_request_writer
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_TypeLookup_request_writer
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_TypeLookup_request_reader
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_TypeLookup_request_reader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_TypeLookup_reply_writer
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_TypeLookup_reply_writer
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_TypeLookup_reply_reader
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_TypeLookup_reply_reader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::sedp_builtin_publications_secure_writer
.. doxygenvariable:: eprosima::fastdds::rtps::sedp_builtin_publications_secure_writer
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::sedp_builtin_publications_secure_reader
.. doxygenvariable:: eprosima::fastdds::rtps::sedp_builtin_publications_secure_reader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::sedp_builtin_subscriptions_secure_writer
.. doxygenvariable:: eprosima::fastdds::rtps::sedp_builtin_subscriptions_secure_writer
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::sedp_builtin_subscriptions_secure_reader
.. doxygenvariable:: eprosima::fastdds::rtps::sedp_builtin_subscriptions_secure_reader
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::participant_volatile_message_secure_writer_entity_id
.. doxygenvariable:: eprosima::fastdds::rtps::participant_volatile_message_secure_writer_entity_id
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::participant_volatile_message_secure_reader_entity_id
.. doxygenvariable:: eprosima::fastdds::rtps::participant_volatile_message_secure_reader_entity_id
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_WriterLivelinessSecure
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_WriterLivelinessSecure
:project: FastDDS

.. doxygenvariable:: eprosima::fastrtps::rtps::c_EntityId_ReaderLivelinessSecure
.. doxygenvariable:: eprosima::fastdds::rtps::c_EntityId_ReaderLivelinessSecure
:project: FastDDS

Loading

0 comments on commit 79416a6

Please sign in to comment.