From d1e092c83a1134af475de5fbab88dedc9271859c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= <ricardo@richiware.dev>
Date: Tue, 12 Mar 2024 09:50:42 +0100
Subject: [PATCH] Refs #19451.- Fix warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
---
 .../eprosima/fastcdr/idl/templates/FastCdrCommon.stg   | 10 ++++++++++
 .../com/eprosima/fastcdr/idl/templates/TypesHeader.stg | 10 ----------
 .../fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg    |  2 +-
 3 files changed, 11 insertions(+), 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
index 12bc5f26..0f8f316d 100644
--- 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
index 19fd9070..93200dbe 100644
--- 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
index 844a611a..8f597fe6 100644
--- 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;