From c3e3c73df5288c891660a6d31a526d9d5634d7ae Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Wed, 24 Jul 2024 15:11:40 +0200 Subject: [PATCH] Remove FASTCDR_VERSION_MAJOR == 1 related code (#378) Signed-off-by: eduponz --- .../eprosima/fastcdr/idl/templates/TypesSwigInterface.stg | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg index cbd12bda..156d344e 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg @@ -52,9 +52,7 @@ $ctx.directIncludeDependencies : {include | %include "$include$.i"}; separator=" %} %include -#if FASTCDR_VERSION_MAJOR > 1 %import(module="fastdds") "fastcdr/xcdr/optional.hpp" -#endif %import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp" %import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp" @@ -147,9 +145,6 @@ $endif$ member_getters(struct_name, member) ::= << $if(member.annotationOptional)$ -#if FASTCDR_VERSION_MAJOR == 1 -%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&); -#else %ignore eprosima::fastcdr::optional::value; %ignore eprosima::fastcdr::optional::reset; %template($member.typecode.noScopedCppTypename$Opt) eprosima::fastcdr::optional<$member.typecode.cppTypename$>; @@ -163,7 +158,6 @@ $if(member.annotationOptional)$ } } %ignore $struct_name$::$member.name$(eprosima::fastcdr::optional<$member.typecode.cppTypename$>&&); -#endif $else$ %ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&); $endif$