Skip to content

Commit ceaa67b

Browse files
richiwareJLBuenoLopez
richiware
authored and
JLBuenoLopez
committed
Refs #19975. Using new ReturnCode_t
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 05fe563 commit ceaa67b

9 files changed

Lines changed: 66 additions & 50 deletions

File tree

‎fastdds_python/src/swig/fastdds.i‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ namespace builtin {
429429
*/
430430

431431
%include "fastdds/dds/common/InstanceHandle.i"
432+
%include "fastdds/dds/core/ReturnCode.i"
432433
%include "fastdds/dds/core/status/StatusMask.i"
433434
%include "fastdds/dds/core/policy/ParameterTypes.i"
434435
%include "fastdds/dds/core/policy/QosPolicies.i"

‎fastdds_python/src/swig/fastdds/dds/core/ReturnCode.i‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima).
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
%{
16+
#include "fastdds/dds/core/ReturnCode.hpp"
17+
%}
18+
19+
20+
%include "fastdds/dds/core/detail/DDSReturnCode.hpp"
21+
%include "fastdds/dds/core/detail/DDSSecurityReturnCode.hpp"
22+
%include "fastdds/dds/core/ReturnCode.hpp"

‎fastdds_python/src/swig/fastdds/dds/domain/DomainParticipant.i‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
eprosima::fastdds::dds::DomainParticipantListener* old_listener =
3131
const_cast<eprosima::fastdds::dds::DomainParticipantListener*>(self->get_listener());
3232

33-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener);
33+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener);
3434

35-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
35+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
3636
{
3737

3838
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -75,9 +75,9 @@
7575
eprosima::fastdds::dds::DomainParticipantListener* old_listener =
7676
const_cast<eprosima::fastdds::dds::DomainParticipantListener*>(self->get_listener());
7777

78-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener, mask);
78+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener, mask);
7979

80-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
80+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
8181
{
8282

8383
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -174,7 +174,7 @@
174174
{
175175
eprosima::fastdds::dds::PublisherListener* listener =
176176
const_cast<eprosima::fastdds::dds::PublisherListener*>(publisher->get_listener());
177-
eprosima::fastrtps::types::ReturnCode_t ret = self->delete_publisher(publisher);
177+
eprosima::fastdds::dds::ReturnCode_t ret = self->delete_publisher(publisher);
178178

179179
if (nullptr != listener)
180180
{
@@ -259,7 +259,7 @@
259259
{
260260
eprosima::fastdds::dds::SubscriberListener* listener =
261261
const_cast<eprosima::fastdds::dds::SubscriberListener*>(subscriber->get_listener());
262-
eprosima::fastrtps::types::ReturnCode_t ret = self->delete_subscriber(subscriber);
262+
eprosima::fastdds::dds::ReturnCode_t ret = self->delete_subscriber(subscriber);
263263

264264
if (nullptr != listener)
265265
{

‎fastdds_python/src/swig/fastdds/dds/domain/DomainParticipantFactory.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
{
124124
eprosima::fastdds::dds::DomainParticipantListener* listener =
125125
const_cast<eprosima::fastdds::dds::DomainParticipantListener*>(part->get_listener());
126-
eprosima::fastrtps::types::ReturnCode_t ret = self->delete_participant(part);
126+
eprosima::fastdds::dds::ReturnCode_t ret = self->delete_participant(part);
127127

128128
if (nullptr != listener)
129129
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
%extend eprosima::fastdds::dds::DataWriter
3939
{
4040
// TODO Document with %feature("autodoc")
41-
eprosima::fastrtps::types::ReturnCode_t clear_history(size_t* removed)
41+
eprosima::fastdds::dds::ReturnCode_t clear_history(size_t* removed)
4242
{
43-
eprosima::fastrtps::types::ReturnCode_t ret = self->clear_history(removed);
43+
eprosima::fastdds::dds::ReturnCode_t ret = self->clear_history(removed);
4444
return ret;
4545
}
4646

@@ -50,9 +50,9 @@
5050
eprosima::fastdds::dds::DataWriterListener* old_listener =
5151
const_cast<eprosima::fastdds::dds::DataWriterListener*>(self->get_listener());
5252

53-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener);
53+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener);
5454

55-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
55+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
5656
{
5757

5858
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -88,9 +88,9 @@
8888
eprosima::fastdds::dds::DataWriterListener* old_listener =
8989
const_cast<eprosima::fastdds::dds::DataWriterListener*>(self->get_listener());
9090

91-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener, mask);
91+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener, mask);
9292

93-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
93+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
9494
{
9595

9696
SWIG_PYTHON_THREAD_BEGIN_BLOCK;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
eprosima::fastdds::dds::PublisherListener* old_listener =
3131
const_cast<eprosima::fastdds::dds::PublisherListener*>(self->get_listener());
3232

33-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener);
33+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener);
3434

35-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
35+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
3636
{
3737

3838
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -76,9 +76,9 @@
7676
eprosima::fastdds::dds::PublisherListener* old_listener =
7777
const_cast<eprosima::fastdds::dds::PublisherListener*>(self->get_listener());
7878

79-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener, mask);
79+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener, mask);
8080

81-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
81+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
8282
{
8383

8484
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -187,7 +187,7 @@
187187
{
188188
eprosima::fastdds::dds::DataWriterListener* listener =
189189
const_cast<eprosima::fastdds::dds::DataWriterListener*>(writer->get_listener());
190-
eprosima::fastrtps::types::ReturnCode_t ret = self->delete_datawriter(writer);
190+
eprosima::fastdds::dds::ReturnCode_t ret = self->delete_datawriter(writer);
191191

192192
if (nullptr != listener)
193193
{

‎fastdds_python/src/swig/fastdds/dds/subscriber/DataReader.i‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
eprosima::fastdds::dds::DataReaderListener* old_listener =
4242
const_cast<eprosima::fastdds::dds::DataReaderListener*>(self->get_listener());
4343

44-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener);
44+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener);
4545

46-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
46+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
4747
{
4848

4949
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -79,16 +79,16 @@
7979
eprosima::fastdds::dds::DataReaderListener* old_listener =
8080
const_cast<eprosima::fastdds::dds::DataReaderListener*>(self->get_listener());
8181

82-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener, mask);
82+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener, mask);
8383

84-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
84+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
8585
{
8686

8787
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
8888
if (nullptr != listener)
8989
{
9090
Swig::Director* director = SWIG_DIRECTOR_CAST(listener);
91-
91+
9292
if (nullptr != director)
9393
{
9494
Py_INCREF(director->swig_get_self());
@@ -97,7 +97,7 @@
9797
if (nullptr != old_listener)
9898
{
9999
Swig::Director* director = SWIG_DIRECTOR_CAST(old_listener);
100-
100+
101101
if (nullptr != director)
102102
{
103103
Py_DECREF(director->swig_get_self());

‎fastdds_python/src/swig/fastdds/dds/subscriber/Subscriber.i‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
eprosima::fastdds::dds::SubscriberListener* old_listener =
3131
const_cast<eprosima::fastdds::dds::SubscriberListener*>(self->get_listener());
3232

33-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener);
33+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener);
3434

35-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
35+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
3636
{
3737

3838
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -75,9 +75,9 @@
7575
eprosima::fastdds::dds::SubscriberListener* old_listener =
7676
const_cast<eprosima::fastdds::dds::SubscriberListener*>(self->get_listener());
7777

78-
eprosima::fastrtps::types::ReturnCode_t ret = self->set_listener(listener, mask);
78+
eprosima::fastdds::dds::ReturnCode_t ret = self->set_listener(listener, mask);
7979

80-
if ( (eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK == ret) && (listener != old_listener) )
80+
if ( (eprosima::fastdds::dds::RETCODE_OK == ret) && (listener != old_listener) )
8181
{
8282

8383
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -182,7 +182,7 @@
182182
{
183183
eprosima::fastdds::dds::DataReaderListener* listener =
184184
const_cast<eprosima::fastdds::dds::DataReaderListener*>(reader->get_listener());
185-
eprosima::fastrtps::types::ReturnCode_t ret = self->delete_datareader(reader);
185+
eprosima::fastdds::dds::ReturnCode_t ret = self->delete_datareader(reader);
186186

187187
if (nullptr != listener)
188188
{

‎fastdds_python/src/swig/fastrtps/types/TypesBase.i‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
// We must explicitly declare the specializations of the templates
2323
%template(OctetSeq) std::vector<eprosima::fastrtps::rtps::octet>;
2424

25-
// Although explicitly deleted, SWIG still tries to create this method
26-
%ignore eprosima::fastrtps::types::ReturnCode_t::operator bool;
27-
2825
// Ignore overloaded constructors
2926
%ignore eprosima::fastrtps::types::MemberFlag::MemberFlag(MemberFlag &&);
3027
%ignore eprosima::fastrtps::types::TypeFlag::TypeFlag(TypeFlag &&);
@@ -43,23 +40,19 @@
4340
%ignore eprosima::fastrtps::types::operator==;
4441
%ignore eprosima::fastrtps::types::operator!=;
4542

46-
%include "fastrtps/types/TypesBase.h"
47-
48-
%extend eprosima::fastrtps::types::ReturnCode_t {
49-
std::string __str__() const
50-
{
51-
std::ostringstream out;
52-
out << (*$self)();
53-
return out.str();
54-
}
43+
%ignore eprosima::fastrtps::types::RETCODE_OK;
44+
%ignore eprosima::fastrtps::types::RETCODE_ERROR;
45+
%ignore eprosima::fastrtps::types::RETCODE_UNSUPPORTED;
46+
%ignore eprosima::fastrtps::types::RETCODE_BAD_PARAMETER;
47+
%ignore eprosima::fastrtps::types::RETCODE_PRECONDITION_NOT_MET;
48+
%ignore eprosima::fastrtps::types::RETCODE_OUT_OF_RESOURCES;
49+
%ignore eprosima::fastrtps::types::RETCODE_NOT_ENABLED;
50+
%ignore eprosima::fastrtps::types::RETCODE_IMMUTABLE_POLICY;
51+
%ignore eprosima::fastrtps::types::RETCODE_INCONSISTENT_POLICY;
52+
%ignore eprosima::fastrtps::types::RETCODE_ALREADY_DELETED;
53+
%ignore eprosima::fastrtps::types::RETCODE_TIMEOUT;
54+
%ignore eprosima::fastrtps::types::RETCODE_NO_DATA;
55+
%ignore eprosima::fastrtps::types::RETCODE_ILLEGAL_OPERATION;
5556

56-
bool operator==(eprosima::fastrtps::types::ReturnCode_t::ReturnCodeValue value) const
57-
{
58-
return *$self == value;
59-
}
6057

61-
bool operator!=(eprosima::fastrtps::types::ReturnCode_t::ReturnCodeValue value) const
62-
{
63-
return *$self != value;
64-
}
65-
}
58+
%include "fastrtps/types/TypesBase.h"

0 commit comments

Comments
 (0)