From 08d93cce03c24b06b4c41897e4d84a8c5e05ba6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 9 Sep 2024 12:17:33 +0200 Subject: [PATCH] Refs #21577. Use @FINAL for ROS2 types by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- src/main/java/com/eprosima/fastdds/fastddsgen.java | 1 + .../fastdds/idl/templates/XTypesTypeObjectSource.stg | 12 +----------- thirdparty/idl-parser | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/eprosima/fastdds/fastddsgen.java b/src/main/java/com/eprosima/fastdds/fastddsgen.java index eb76d1f7..df880366 100644 --- a/src/main/java/com/eprosima/fastdds/fastddsgen.java +++ b/src/main/java/com/eprosima/fastdds/fastddsgen.java @@ -369,6 +369,7 @@ else if (arg.equals(execute_test_arg)) else if (arg.equals(ros2_names_arg)) { m_type_ros2 = true; + TypeCode.default_extensibility = TypeCode.ExtensibilityKind.FINAL; } else if (arg.equals(cnames_arg)) { 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 3d774556..22623187 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg @@ -916,17 +916,7 @@ if (eprosima::fastdds::dds::RETCODE_OK != return_code_$name$) >> extensibility(object) ::= <% -$if (object.annotationExtensibilityNotApplied)$ - $if(object.isStructType)$ - $if(object.inheritance)$ - $extensibility(object.inheritance)$ - $else$ - eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE, - $endif$ - $else$ - eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE, - $endif$ -$elseif (object.annotationAppendable)$ +$if (object.annotationAppendable)$ eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE, $elseif (object.annotationFinal)$ eprosima::fastdds::dds::xtypes::ExtensibilityKind::FINAL, diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index 8191ad23..015e2f1c 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit 8191ad23c8c146fa3d08be74373f009572745b39 +Subproject commit 015e2f1c430a0ddbcbecda7e7198a6f9aab5a7d1