Fix generated code compilation when a union uses an alias with scope (#…

…411) * Refs #21823. Regression test Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Fix Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Apply suggestion Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Update submodule Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Fix render blank lines Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Oct 25, 2024 · bbf86e3 · bbf86e3
1 parent fc9928b
commit bbf86e3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
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>

diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test
diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser