From d9e60bdf04316fed787533f2397b4ce50ebca6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 24 Jun 2024 10:42:05 +0200 Subject: [PATCH 1/2] Refs #21222. Support union discriminator's @default annotation 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 | 6 ++++-- .../fastdds/idl/templates/XTypesTypeObjectSource.stg | 2 +- thirdparty/dds-types-test | 2 +- thirdparty/idl-parser | 2 +- 4 files changed, 7 insertions(+), 5 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 a4191af6..e1d7f70d 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg @@ -295,7 +295,9 @@ public: */ eProsima_user_DllExport $union.name$() { - $if(union.defaultMember)$ + $if(union.defaultAnnotatedMember)$ + $union.defaultAnnotatedMember.name$_(); + $elseif(union.defaultMember)$ $union.defaultMember.name$_(); $endif$ } @@ -510,7 +512,7 @@ private: \} }; separator="\n"$ - $union.discriminator.typecode.cppTypename$ m__d {$union.defaultvalue$}; + $union.discriminator.typecode.cppTypename$ m__d {$if(union.defaultAnnotatedValue)$$union.defaultAnnotatedValue$$else$$union.defaultvalue$$endif$}; union { diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg index 5db00506..3d774556 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg @@ -877,7 +877,7 @@ $endif$ }; separator="\n"$ if (!tmp_ann_custom_$type.name$.empty()) { - ann_custom_$type.name$ = tmp_ann_custom_$type.name$; + ann_custom_$name$ = tmp_ann_custom_$type.name$; } $endif$ >> diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test index ef234fb8..bebeb286 160000 --- a/thirdparty/dds-types-test +++ b/thirdparty/dds-types-test @@ -1 +1 @@ -Subproject commit ef234fb8071c0a93fee23a40537592df7e1778bc +Subproject commit bebeb2862ebabf6adb7d96e1afaaa231d284bb6f diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index 97ed0b35..b775689c 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit 97ed0b3533abeff445c77ea9a976604fd25c8967 +Subproject commit b775689c9499935365328f12d89653db53078ac7 From 9f069761644faa4dbc447b307117729df7d5474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 8 Jul 2024 08:28:15 +0200 Subject: [PATCH 2/2] Refs #21222. 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/idl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index b775689c..03fbf21d 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit b775689c9499935365328f12d89653db53078ac7 +Subproject commit 03fbf21d24ba42a70e558cb3ab2caa77fccf9fbe