Skip to content

Commit

Permalink
Fix compilation warning in Ubuntu 24.04 with -Werror (#395)
Browse files Browse the repository at this point in the history
* Refs #21621. Fix warning on Ubuntu 24.04

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #21621. Improve code

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
  • Loading branch information
richiware authored Sep 11, 2024
1 parent dc85a19 commit c342de3
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ public:
eProsima_user_DllExport $union.name$()
{
$if(union.defaultAnnotatedMember)$
$union.defaultAnnotatedMember.name$_();
$union_member_initialization(union.defaultAnnotatedMember)$
$elseif(union.defaultMember)$
$union.defaultMember.name$_();
$union_member_initialization(union.defaultMember)$
$endif$
}

Expand Down Expand Up @@ -498,14 +498,7 @@ private:
member_destructor_();
\}

selected_member_ = $member.id$;
$if(member.typecode.primitive)$
member_destructor_ = nullptr;
m_$member.name$ = $member_default_init(member)$;
$else$
member_destructor_ = [&]() {$union_member_destroy_call(member)$\};
new(&m_$member.name$) $member_type_declaration(member)$();
$endif$;
$union_member_initialization(member)$
\}

return m_$member.name$;
Expand Down Expand Up @@ -828,6 +821,17 @@ f
$endif$
%>

union_member_initialization(member) ::= <<
selected_member_ = $member.id$;
$if(member.typecode.primitive)$
member_destructor_ = nullptr;
m_$member.name$ = $member_default_init(member)$;
$else$
member_destructor_ = [&]() {$union_member_destroy_call(member)$\};
new(&m_$member.name$) $member_type_declaration(member)$();
$endif$
>>

//{ Fast DDS-Gen extensions
module_conversion(ctx, parent, modules, definition_list) ::= <<
$modules : { module |
Expand Down

0 comments on commit c342de3

Please sign in to comment.