Skip to content

Commit 73c83f4

Browse files
elianalfelianalf
committed
Refs #21129: Change fastrtps namespace to fastdds
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent d4b50af commit 73c83f4

34 files changed

Lines changed: 204 additions & 204 deletions

‎fastdds_python/src/swig/fastdds/dds/core/policy/QosPolicies.i‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
namespace eprosima {
5353
namespace fastdds {
5454
namespace dds {
55-
struct ParticipantResourceLimitsQos : public fastrtps::rtps::RTPSParticipantAllocationAttributes {};
56-
struct PropertyPolicyQos : public fastrtps::rtps::PropertyPolicy {};
55+
struct ParticipantResourceLimitsQos : public fastdds::rtps::RTPSParticipantAllocationAttributes {};
56+
struct PropertyPolicyQos : public fastdds::rtps::PropertyPolicy {};
5757
}
5858
}
5959
}
@@ -63,21 +63,21 @@ class OctetResourceLimitedVectorStopIterator {};
6363
class OctetResourceLimitedVectorIterator {
6464
public:
6565
OctetResourceLimitedVectorIterator(
66-
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator _cur,
67-
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator _end) : cur(_cur), end(_end) {}
66+
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator _cur,
67+
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator _end) : cur(_cur), end(_end) {}
6868
OctetResourceLimitedVectorIterator* __iter__()
6969
{
7070
return this;
7171
}
72-
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator cur;
73-
eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::iterator end;
72+
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator cur;
73+
eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::iterator end;
7474
};
7575
%}
7676

7777
// SWIG does not support templates in the generated binding,
7878
// because not all output languages support them
7979
// We must explicitly declare the specializations of the templates
80-
%template(OctetResourceLimitedVector) eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>;
80+
%template(OctetResourceLimitedVector) eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>;
8181

8282
%include "fastdds/dds/core/policy/QosPolicies.hpp"
8383

@@ -96,7 +96,7 @@ public:
9696

9797
%extend OctetResourceLimitedVectorIterator
9898
{
99-
eprosima::fastrtps::rtps::octet __next__()
99+
eprosima::fastdds::rtps::octet __next__()
100100
{
101101
if ($self->cur != $self->end)
102102
{
@@ -108,7 +108,7 @@ public:
108108
}
109109
}
110110

111-
%exception eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>::__getitem__
111+
%exception eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>::__getitem__
112112
{
113113
try
114114
{
@@ -120,7 +120,7 @@ public:
120120
}
121121
}
122122

123-
%extend eprosima::fastrtps::ResourceLimitedVector<eprosima::fastrtps::rtps::octet>
123+
%extend eprosima::fastdds::ResourceLimitedVector<eprosima::fastdds::rtps::octet>
124124
{
125125
OctetResourceLimitedVectorIterator __iter__()
126126
{
@@ -133,7 +133,7 @@ public:
133133
return self->size();
134134
}
135135

136-
eprosima::fastrtps::rtps::octet __getitem__(int i)
136+
eprosima::fastdds::rtps::octet __getitem__(int i)
137137
{
138138
if (self->size() <= i)
139139
{

‎fastdds_python/src/swig/fastdds/dds/publisher/DataWriter.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
// Deprecated function are ignored
2121
%ignore eprosima::fastdds::dds::DataWriter::write_w_timestamp(void*, const InstanceHandle_t&,
22-
const fastrtps::rtps::Time_t&);
22+
const fastdds::rtps::Time_t&);
2323
%ignore eprosima::fastdds::dds::DataWriter::register_instance_w_timestamp(void*,
24-
const fastrtps::rtps::Time_t&);
24+
const fastdds::rtps::Time_t&);
2525
%ignore eprosima::fastdds::dds::DataWriter::unregister_instance_w_timestamp(void*, const InstanceHandle_t&,
26-
const fastrtps::rtps::Time_t&);
26+
const fastdds::rtps::Time_t&);
2727

2828
// Unsupported function on Python are ignored
2929
%ignore loan_sample(void*&, LoanInitializationKind);

‎fastdds_python/src/swig/fastdds/rtps/attributes/PropertyPolicy.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
%}
1818

1919
// Ignore overloaded constructor that have no effect on target language
20-
%ignore eprosima::fastrtps::rtps::PropertyPolicy::PropertyPolicy(PropertyPolicy &&);
21-
%ignore eprosima::fastrtps::rtps::PropertyPolicyHelper;
20+
%ignore eprosima::fastdds::rtps::PropertyPolicy::PropertyPolicy(PropertyPolicy &&);
21+
%ignore eprosima::fastdds::rtps::PropertyPolicyHelper;
2222

2323
%include "fastdds/rtps/attributes/PropertyPolicy.h"

‎fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
%}
1818

1919
// Ignore deprecated methods
20-
%ignore eprosima::fastrtps::rtps::DiscoverySettings::setStaticEndpointXMLFilename;
21-
%ignore eprosima::fastrtps::rtps::DiscoverySettings::getStaticEndpointXMLFilename;
22-
%ignore eprosima::fastrtps::rtps::RTPSParticipantAttributes;
23-
%ignore eprosima::fastrtps::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);;
20+
%ignore eprosima::fastdds::rtps::DiscoverySettings::setStaticEndpointXMLFilename;
21+
%ignore eprosima::fastdds::rtps::DiscoverySettings::getStaticEndpointXMLFilename;
22+
%ignore eprosima::fastdds::rtps::RTPSParticipantAttributes;
23+
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);;
2424

2525
%include "fastdds/rtps/attributes/RTPSParticipantAttributes.h"

‎fastdds_python/src/swig/fastdds/rtps/attributes/ReaderAttributes.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
#include "fastdds/rtps/attributes/ReaderAttributes.h"
1717
%}
1818

19-
%ignore eprosima::fastrtps::rtps::ReaderAttributes;
19+
%ignore eprosima::fastdds::rtps::ReaderAttributes;
2020

2121
%include "fastdds/rtps/attributes/ReaderAttributes.h"

‎fastdds_python/src/swig/fastdds/rtps/attributes/WriterAttributes.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
#include "fastdds/rtps/attributes/WriterAttributes.h"
1717
%}
1818

19-
%ignore eprosima::fastrtps::rtps::WriterAttributes;
19+
%ignore eprosima::fastdds::rtps::WriterAttributes;
2020

2121
%include "fastdds/rtps/attributes/WriterAttributes.h"

‎fastdds_python/src/swig/fastdds/rtps/common/BinaryProperty.i‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
%}
1818

1919
// Ignore overloaded constructor and methods that have no effect on target language
20-
%ignore eprosima::fastrtps::rtps::BinaryProperty::BinaryProperty(BinaryProperty &&);
21-
%ignore eprosima::fastrtps::rtps::BinaryProperty::name(std::string &&);
22-
%ignore eprosima::fastrtps::rtps::BinaryProperty::value(std::vector<uint8_t> &&);
23-
%ignore eprosima::fastrtps::rtps::BinaryProperty::propagate() const;
24-
%ignore eprosima::fastrtps::rtps::BinaryProperty::name() const;
25-
%ignore eprosima::fastrtps::rtps::BinaryProperty::value() const;
20+
%ignore eprosima::fastdds::rtps::BinaryProperty::BinaryProperty(BinaryProperty &&);
21+
%ignore eprosima::fastdds::rtps::BinaryProperty::name(std::string &&);
22+
%ignore eprosima::fastdds::rtps::BinaryProperty::value(std::vector<uint8_t> &&);
23+
%ignore eprosima::fastdds::rtps::BinaryProperty::propagate() const;
24+
%ignore eprosima::fastdds::rtps::BinaryProperty::name() const;
25+
%ignore eprosima::fastdds::rtps::BinaryProperty::value() const;
2626

2727
// SWIG does not support templates in the generated binding,
2828
// because not all output languages support them
2929
// We must explicitly declare the specializations of the templates
30-
%template(BinaryPropertySeq) std::vector<eprosima::fastrtps::rtps::BinaryProperty>;
30+
%template(BinaryPropertySeq) std::vector<eprosima::fastdds::rtps::BinaryProperty>;
3131

3232
%include "fastdds/rtps/common/BinaryProperty.h"

‎fastdds_python/src/swig/fastdds/rtps/common/CDRMessage_t.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
%}
1818

1919
// Overloaded constructor ignored
20-
%ignore eprosima::fastrtps::rtps::CDRMessage_t::CDRMessage_t(CDRMessage_t &&);
20+
%ignore eprosima::fastdds::rtps::CDRMessage_t::CDRMessage_t(CDRMessage_t &&);
2121

2222
%include "fastdds/rtps/common/CDRMessage_t.h"

‎fastdds_python/src/swig/fastdds/rtps/common/CacheChange.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
%}
1818

1919
// Ignore problematic classes that are not part of the user API
20-
%ignore eprosima::fastrtps::rtps::CacheChangeWriterInfo_t;
21-
%ignore eprosima::fastrtps::rtps::CacheChangeReaderInfo_t;
20+
%ignore eprosima::fastdds::rtps::CacheChangeWriterInfo_t;
21+
%ignore eprosima::fastdds::rtps::CacheChangeReaderInfo_t;
2222

2323
%include "fastdds/rtps/common/CacheChange.h"

‎fastdds_python/src/swig/fastdds/rtps/common/EntityId_t.i‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
// Define a hash method in global scope for EntityId_t types
1919
// This is necessary if we want other classes to hash an internal EntityId_t
20-
long hash(const eprosima::fastrtps::rtps::EntityId_t& id)
20+
long hash(const eprosima::fastdds::rtps::EntityId_t& id)
2121
{
2222
long ret = 0;
23-
for (unsigned int i = 0; i < eprosima::fastrtps::rtps::EntityId_t::size; ++i)
23+
for (unsigned int i = 0; i < eprosima::fastdds::rtps::EntityId_t::size; ++i)
2424
{
2525
ret = (ret * 31) ^ id.value[i];
2626
}
@@ -29,13 +29,13 @@ long hash(const eprosima::fastrtps::rtps::EntityId_t& id)
2929
%}
3030

3131
// Overloaded constructor ignored
32-
%ignore eprosima::fastrtps::rtps::EntityId_t::EntityId_t(EntityId_t &&);
33-
%ignore eprosima::fastrtps::rtps::operator <<(std::ostream&, const EntityId_t&);
34-
%ignore eprosima::fastrtps::rtps::operator >>(std::istream&, EntityId_t&);
32+
%ignore eprosima::fastdds::rtps::EntityId_t::EntityId_t(EntityId_t &&);
33+
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const EntityId_t&);
34+
%ignore eprosima::fastdds::rtps::operator >>(std::istream&, EntityId_t&);
3535

3636
// Operators declared outside the class conflict with those declared for other types
37-
%ignore eprosima::fastrtps::rtps::operator==;
38-
%ignore eprosima::fastrtps::rtps::operator!=;
37+
%ignore eprosima::fastdds::rtps::operator==;
38+
%ignore eprosima::fastdds::rtps::operator!=;
3939

4040
// Declare hash so that we do not get a warning
4141
// This will make an empty class on the target, but the user should not need this anyway.
@@ -44,7 +44,7 @@ namespace std {
4444
struct hash;
4545
}
4646

47-
%typemap(in) eprosima::fastrtps::rtps::octet[eprosima::fastrtps::rtps::EntityId_t::size](eprosima::fastrtps::rtps::octet temp[eprosima::fastrtps::rtps::EntityId_t::size])
47+
%typemap(in) eprosima::fastdds::rtps::octet[eprosima::fastdds::rtps::EntityId_t::size](eprosima::fastdds::rtps::octet temp[eprosima::fastdds::rtps::EntityId_t::size])
4848
{
4949
if (PyTuple_Check($input))
5050
{
@@ -63,13 +63,13 @@ namespace std {
6363
}
6464
}
6565

66-
%typemap(out) eprosima::fastrtps::rtps::octet[eprosima::fastrtps::rtps::EntityId_t::size]
66+
%typemap(out) eprosima::fastdds::rtps::octet[eprosima::fastdds::rtps::EntityId_t::size]
6767
{
68-
PyObject* python_tuple = PyTuple_New(eprosima::fastrtps::rtps::EntityId_t::size);
68+
PyObject* python_tuple = PyTuple_New(eprosima::fastdds::rtps::EntityId_t::size);
6969

7070
if (python_tuple)
7171
{
72-
for(size_t count = 0; count < eprosima::fastrtps::rtps::EntityId_t::size; ++count)
72+
for(size_t count = 0; count < eprosima::fastdds::rtps::EntityId_t::size; ++count)
7373
{
7474
PyTuple_SetItem(python_tuple, count, PyInt_FromLong($1[count]));
7575
}
@@ -81,8 +81,8 @@ namespace std {
8181
%include "fastdds/rtps/common/EntityId_t.hpp"
8282

8383
// Declare the comparison operators as internal to the class
84-
%extend eprosima::fastrtps::rtps::EntityId_t {
85-
bool operator==(const eprosima::fastrtps::rtps::EntityId_t& other) const
84+
%extend eprosima::fastdds::rtps::EntityId_t {
85+
bool operator==(const eprosima::fastdds::rtps::EntityId_t& other) const
8686
{
8787
return *$self == other;
8888
}
@@ -92,7 +92,7 @@ namespace std {
9292
return *$self == other;
9393
}
9494

95-
bool operator!=(const eprosima::fastrtps::rtps::EntityId_t& other) const
95+
bool operator!=(const eprosima::fastdds::rtps::EntityId_t& other) const
9696
{
9797
return *$self != other;
9898
}

0 commit comments

Comments
 (0)