Refs #19451.- Fix warnings

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Mar 12, 2024 · d1e092c · d1e092c
1 parent 84fba19
commit d1e092c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
@@ -59,3 +59,13 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$
 {
     free(str);
 }$endif$>>
+
+member_default_init(member) ::= <%
+$if(member.annotationDefault)$
+ {$member.annotationDefaultValue$}
+$elseif(!member.annotationOptional && !member.annotationExternal)$
+$if(member.typecode.initialValue)$
+ {$member.typecode.initialValue$}
+$endif$
+$endif$
+%>
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -942,16 +942,6 @@ eProsima_user_DllExport $member_type_declaration(member)$& $member.name$()
 }
 >>
 
-member_default_init(member) ::= <%
-$if(member.annotationDefault)$
- {$member.annotationDefaultValue$}
-$elseif(!member.annotationOptional && !member.annotationExternal)$
-$if(member.typecode.initialValue)$
- {$member.typecode.initialValue$}
-$endif$
-$endif$
-%>
-
 member_move(member) ::= <%
 $if(member.typecode.primitive)$
 m_$member.name$ = x.m_$member.name$;

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg
@@ -333,7 +333,7 @@ eProsima_user_DllExport void deserialize(
                         $member.labels:{ label |case $label$:}; separator="\n"$
                         $if(member.default)$default:$endif$
                             {
-                                $member_type_declaration(member)$ $member.name$_value;
+                                $member_type_declaration(member)$ $member.name$_value$member_default_init(member)$;
                                 data.$member.name$(std::move($member.name$_value));
                                 data._d(discriminator);
                                 break;