From a2ba51ef3eb01b830514092712b38cd2c689a624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Mon, 4 May 2026 12:47:07 +0200 Subject: [PATCH 1/2] Ignore new RTPSParticipantAttributes (#294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González (cherry picked from commit 99dc81489bb6a3ab908a696ddc3ec9575a50c155) # Conflicts: # fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i --- .../fastdds/rtps/attributes/RTPSParticipantAttributes.i | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i b/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i index 2c251a78..ede00117 100644 --- a/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i +++ b/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i @@ -17,9 +17,18 @@ %} // Ignore deprecated methods +<<<<<<< HEAD %ignore eprosima::fastrtps::rtps::DiscoverySettings::setStaticEndpointXMLFilename; %ignore eprosima::fastrtps::rtps::DiscoverySettings::getStaticEndpointXMLFilename; %ignore eprosima::fastrtps::rtps::RTPSParticipantAttributes; %ignore eprosima::fastrtps::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);; +======= +%ignore eprosima::fastdds::rtps::DiscoverySettings::setStaticEndpointXMLFilename; +%ignore eprosima::fastdds::rtps::DiscoverySettings::getStaticEndpointXMLFilename; +%ignore eprosima::fastdds::rtps::RTPSParticipantAttributes; +%ignore eprosima::fastdds::rtps::RTPSParticipantConstantAttributes; +%ignore eprosima::fastdds::rtps::RTPSParticipantMutableAttributes; +%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);; +>>>>>>> 99dc814 (Ignore new RTPSParticipantAttributes (#294)) %include "fastdds/rtps/attributes/RTPSParticipantAttributes.h" From d6fea1d792bbb773de4c96c3d9babe6166ae7afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Tue, 2 Jun 2026 14:26:13 +0200 Subject: [PATCH 2/2] Solve conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González --- .../rtps/attributes/RTPSParticipantAttributes.i | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i b/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i index ede00117..65d31f5d 100644 --- a/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i +++ b/fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i @@ -17,18 +17,11 @@ %} // Ignore deprecated methods -<<<<<<< HEAD %ignore eprosima::fastrtps::rtps::DiscoverySettings::setStaticEndpointXMLFilename; %ignore eprosima::fastrtps::rtps::DiscoverySettings::getStaticEndpointXMLFilename; %ignore eprosima::fastrtps::rtps::RTPSParticipantAttributes; +%ignore eprosima::fastrtps::rtps::RTPSParticipantConstantAttributes; +%ignore eprosima::fastrtps::rtps::RTPSParticipantMutableAttributes; %ignore eprosima::fastrtps::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);; -======= -%ignore eprosima::fastdds::rtps::DiscoverySettings::setStaticEndpointXMLFilename; -%ignore eprosima::fastdds::rtps::DiscoverySettings::getStaticEndpointXMLFilename; -%ignore eprosima::fastdds::rtps::RTPSParticipantAttributes; -%ignore eprosima::fastdds::rtps::RTPSParticipantConstantAttributes; -%ignore eprosima::fastdds::rtps::RTPSParticipantMutableAttributes; -%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);; ->>>>>>> 99dc814 (Ignore new RTPSParticipantAttributes (#294)) %include "fastdds/rtps/attributes/RTPSParticipantAttributes.h"