Skip to content

Commit 334fa3c

Browse files
JLBuenoLopezrichiware
authored and
EduPonz
committed
Changes to build Fast DDS with XTypes refactor (#116)
* Refs #19960. Apply types header-only Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19975. Using new ReturnCode_t Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20129: update TypeInformationParameter constructor. Define xtypes namespace and DomainId_t Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20335: ignore TypeSupport constructor passing a DynamicPubSubType Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20335: regenerate types Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19451: regenerate types Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #19451: Ignore DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20734: fixes after rebase Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20734: remove obsolete file Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #20734: Fix some tests Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20734. Fix tests Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #20734. Regenerate idl dll exporting missing Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 5abecb7 commit 334fa3c

69 files changed

Lines changed: 85361 additions & 48347 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fastdds_python/src/swig/fastdds.i‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ namespace builtin {
108108
// Just declaring the namespace
109109

110110
} // namespace builtin
111+
112+
namespace xtypes {
113+
114+
// Just declaring the namespace
115+
116+
} // namespace xtypes
111117
} // namespace dds
112118
} // namespace fastdds
113119
} // namespace eprosima
@@ -151,7 +157,6 @@ namespace builtin {
151157
%include "fastdds/rtps/common/SequenceNumber.i"
152158
%include "fastdds/rtps/common/SampleIdentity.i"
153159
%include "fastdds/rtps/common/WriteParams.i"
154-
%include "fastrtps/types/TypesBase.i"
155160

156161
/*
157162
%include "fastdds/rtps/common/SerializedPayload.i"
@@ -429,6 +434,7 @@ namespace builtin {
429434
*/
430435

431436
%include "fastdds/dds/common/InstanceHandle.i"
437+
%include "fastdds/dds/core/ReturnCode.i"
432438
%include "fastdds/dds/core/status/StatusMask.i"
433439
%include "fastdds/dds/core/policy/ParameterTypes.i"
434440
%include "fastdds/dds/core/policy/QosPolicies.i"
@@ -449,6 +455,7 @@ namespace builtin {
449455
%include "fastdds/dds/core/UserAllocatedSequence.i"
450456
%include "fastdds/dds/core/LoanableSequence.i"
451457
%include "fastdds/dds/core/LoanableArray.i"
458+
%include "fastdds/dds/core/Types.i"
452459
%include "fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.i"
453460
%include "fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.i"
454461
%include "fastdds/dds/core/status/LivelinessChangedStatus.i"

‎fastdds_python/src/swig/fastdds/dds/builtin/typelookup/TypeLookupRequestListener.i‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎fastdds_python/src/swig/fastdds/dds/builtin/typelookup/common/TypeLookupTypes.i‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

fastdds_python/src/swig/fastdds/dds/builtin/typelookup/TypeLookupReplyListener.i renamed to fastdds_python/src/swig/fastdds/dds/core/ReturnCode.i

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
1+
// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima).
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -13,7 +13,10 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastdds/dds/builtin/typelookup/TypeLookupReplyListener.hpp"
16+
#include "fastdds/dds/core/ReturnCode.hpp"
1717
%}
1818

19-
%include "fastdds/dds/builtin/typelookup/TypeLookupReplyListener.hpp"
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/builtin/typelookup/TypeLookupManager.i renamed to fastdds_python/src/swig/fastdds/dds/core/Types.i

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
1+
// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastdds/dds/builtin/typelookup/TypeLookupManager.hpp"
16+
#include "fastdds/dds/core/Types.hpp"
1717
%}
1818

19-
%include "fastdds/dds/builtin/typelookup/TypeLookupManager.hpp"
19+
%include "fastdds/dds/core/Types.hpp"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
// Ignore overloaded constructor that have no effect on target language
4848
%ignore eprosima::fastdds::dds::TypeIdV1::TypeIdV1(TypeIdV1 &&);
4949
%ignore eprosima::fastdds::dds::TypeObjectV1::TypeObjectV1(TypeObjectV1 &&);
50-
%ignore eprosima::fastdds::dds::xtypes::TypeInformation::TypeInformation(TypeInformation &&);
50+
%ignore eprosima::fastdds::dds::xtypes::TypeInformationParameter::TypeInformationParameter(TypeInformationParameter &&);
5151

5252
namespace eprosima {
5353
namespace fastdds {

‎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: 2 additions & 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
{
@@ -144,5 +144,6 @@
144144
%ignore eprosima::fastdds::dds::DomainParticipantFactory::create_participant;
145145
%ignore eprosima::fastdds::dds::DomainParticipantFactory::create_participant_with_profile;
146146
%ignore eprosima::fastdds::dds::DomainParticipantFactory::delete_participant;
147+
%ignore eprosima::fastdds::dds::DomainParticipantFactory::get_dynamic_type_builder_from_xml_by_name;
147148

148149
%include "fastdds/dds/domain/DomainParticipantFactory.hpp"

‎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
{

0 commit comments

Comments
 (0)