Skip to content

Commit 9b6e981

Browse files
Fix some warnings in generated code (#593)
* Refs #25536. Add `f` for default values in float types. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #25536. Remove unnecessary braces. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #25536. Remove more unnecessary braces. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #25536. Add braces for array types. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 72f89a0 commit 9b6e981

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$
6262

6363
member_default_init(member) ::= <%
6464
$if(member.annotationDefault)$
65-
{$member.annotationDefaultValue$}
65+
{$member.annotationDefaultValue$$if(member.typecode.isType_5)$f$endif$}
6666
$elseif(!member.annotationOptional && !member.annotationExternal)$
6767
$if(member.typecode.initialValue)$
6868
{$member.typecode.initialValue$}

src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ eProsima_user_DllExport void deserialize(
119119

120120
$struct.allMembers : { member |
121121
$if(member.annotationDefault)$
122-
data.$member.name$({$member.annotationDefaultValue$\});
122+
data.$member.name$($member.annotationDefaultValue$$if(member.typecode.isType_5)$f$endif$);
123123
$elseif(member.annotationOptional)$
124124
data.$member.name$().reset();
125125
$elseif(!member.annotationExternal)$
126126
$if(member.typecode.initialValue)$
127-
data.$member.name$({$member.typecode.initialValue$\});
127+
data.$member.name$($with_braces_if_array(member, member.typecode.initialValue)$);
128128
$elseif(member.typecode.isStringType || member.typecode.isWStringType)$
129129
data.$member.name$({\});
130130
$endif$

src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,11 @@ wstring_name(wstring) ::= <<
235235
anonymous_wstring_$if(wstring.isBounded)$$wstring.evaluatedMaxsize$$else$unbounded$endif$
236236
>>
237237
//}
238+
239+
with_braces_if_array(member, value) ::= <%
240+
$if(member.typecode.isArrayType)$
241+
{$value$}
242+
$else$
243+
$value$
244+
$endif$
245+
%>

0 commit comments

Comments
 (0)