From 48efdcd378d1952555c12f186806d28fd7ff2f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Tue, 8 Oct 2024 09:28:26 +0200 Subject: [PATCH 1/5] Refs #21823. Regression test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- thirdparty/dds-types-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test index 923dc598..d3aea7d7 160000 --- a/thirdparty/dds-types-test +++ b/thirdparty/dds-types-test @@ -1 +1 @@ -Subproject commit 923dc5986cc64bf34ceee2b20fdcb4c045907672 +Subproject commit d3aea7d75abc9e581418bcccdf19c3c569142c42 From 73b0cdadec2c1e007d997891ffd78279b2275c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Tue, 8 Oct 2024 09:28:40 +0200 Subject: [PATCH 2/5] Refs #21823. Fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../com/eprosima/fastcdr/idl/templates/TypesHeader.stg | 10 +++++++++- .../eprosima/fastdds/idl/templates/DDSPubSubMain.stg | 1 + 2 files changed, 10 insertions(+), 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 index 634c7e87..c49a8860 100644 --- 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 index dd3dd356..fc81c9e2 100644 --- 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 +#include #include #include #include From 009bc8d90833542e3c31f7fb27fb53ba5e1f9e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Thu, 17 Oct 2024 12:44:05 +0200 Subject: [PATCH 3/5] Refs #21823. Apply suggestion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg | 2 +- thirdparty/dds-types-test | 2 +- 2 files changed, 2 insertions(+), 2 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 index c49a8860..7901e493 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg @@ -843,7 +843,7 @@ member_destructor_ = [&]() using namespace $member.typecode.scope$; $endif$ $endif$ - $union_member_destroy_call(member)$\ + $union_member_destroy_call(member)$ }; new(&m_$member.name$) $member_type_declaration(member)$(); $endif$ diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test index d3aea7d7..c9f533bd 160000 --- a/thirdparty/dds-types-test +++ b/thirdparty/dds-types-test @@ -1 +1 @@ -Subproject commit d3aea7d75abc9e581418bcccdf19c3c569142c42 +Subproject commit c9f533bd437fa051707cb4b5b09acdcdebc7f718 From f6b69aa8115cc5a8547db5c4fac9789beb6b9068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 18 Oct 2024 08:11:47 +0200 Subject: [PATCH 4/5] Refs #21823. Update submodule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- thirdparty/dds-types-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test index c9f533bd..eff49726 160000 --- a/thirdparty/dds-types-test +++ b/thirdparty/dds-types-test @@ -1 +1 @@ -Subproject commit c9f533bd437fa051707cb4b5b09acdcdebc7f718 +Subproject commit eff497269eebe9dba3559f921b4e749804bf975c From ae7ffe570b66f770e6ccfb4bc1dea952c7cddab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 18 Oct 2024 10:00:48 +0200 Subject: [PATCH 5/5] Refs #21823. Fix render blank lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- thirdparty/idl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index 396ac154..513f4c21 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit 396ac154bcb4c203d0945392aec9abc296eb046e +Subproject commit 513f4c21a91ee98c2a863cbbbd45ce7a260d8e6d