Skip to content

Commit db6c94e

Browse files
committed
Refs #21325: Remove FASTCDR_VERSION_MAJOR == 1 related code
Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent a290e39 commit db6c94e

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

src/main/java/com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ $ctx.directIncludeDependencies : {include | %include "$include$.i"}; separator="
5252
%}
5353

5454
%include <fastcdr/config.h>
55-
#if FASTCDR_VERSION_MAJOR > 1
5655
%import(module="fastdds") "fastcdr/xcdr/optional.hpp"
57-
#endif
5856
%import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp"
5957
%import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp"
6058
%import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp"
@@ -147,9 +145,6 @@ $endif$
147145

148146
member_getters(struct_name, member) ::= <<
149147
$if(member.annotationOptional)$
150-
#if FASTCDR_VERSION_MAJOR == 1
151-
%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&);
152-
#else
153148
%ignore eprosima::fastcdr::optional::value;
154149
%ignore eprosima::fastcdr::optional::reset;
155150
%template($member.typecode.noScopedCppTypename$Opt) eprosima::fastcdr::optional<$member.typecode.cppTypename$>;
@@ -163,7 +158,6 @@ $if(member.annotationOptional)$
163158
}
164159
}
165160
%ignore $struct_name$::$member.name$(eprosima::fastcdr::optional<$member.typecode.cppTypename$>&&);
166-
#endif
167161
$else$
168162
%ignore $struct_name$::$member.name$($member.typecode.cppTypename$&&);
169163
$endif$

0 commit comments

Comments
 (0)