Refs #21823. Fix

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Oct 8, 2024 · 73b0cda · 73b0cda
1 parent 48efdcd
commit 73b0cda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -836,7 +836,15 @@ $if(member.typecode.primitive)$
 member_destructor_ = nullptr;
 m_$member.name$ = $member_default_init(member)$;
 $else$
-member_destructor_ = [&]() {$union_member_destroy_call(member)$\};
+member_destructor_ = [&]()
+{
+    $if(member.typecode.isAliasType)$
+    $if(member.typecode.hasScope)$
+    using namespace $member.typecode.scope$;
+    $endif$
+    $endif$
+    $union_member_destroy_call(member)$\
+};
 new(&m_$member.name$) $member_type_declaration(member)$();
 $endif$
 >>

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg
@@ -20,6 +20,7 @@ main(ctx, definitions) ::= <<
 $fileHeader(ctx=ctx,  file=[ctx.filename, "main.cxx"], description=["This file acts as a main entry point to the application."])$
 
 #include <csignal>
+#include <cstring>
 #include <functional>
 #include <iostream>
 #include <stdexcept>