From 31853bac2d7d723d1495c22b3b5703846dbd483c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Wed, 13 Mar 2024 12:36:16 +0100 Subject: [PATCH] Fix after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../fastdds/idl/templates/XTypesTypeObjectSource.stg | 6 +++++- thirdparty/idl-parser | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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 3cc60233..7b64d313 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg @@ -351,13 +351,17 @@ register_struct_type(struct) ::= << $get_type_identifier(type=struct.inheritance, name=struct.name)$ if (return_code_$struct.name$ != eprosima::fastdds::dds::RETCODE_OK) { + $if(struct.inheritance.isAliasType)$ + $register_alias_type(alias=struct.inheritance, name=struct.name)$ + $else$ $register_struct_type(struct.inheritance)$ + $endif$ } $endif$ $complete_type_detail(type=struct, type_kind=" Structure", name=struct.name)$ CompleteStructHeader header_$struct.name$; $if (struct.inheritance)$ - if (EK_COMPLETE == type_ids_$struct.name$.type_identifier1()._d() || TK_NONE == type_ids_$struct.name$.type_identifier1()._d()) + if (EK_COMPLETE == type_ids_$struct.name$.type_identifier1()._d()) { header_$struct.name$ = TypeObjectUtils::build_complete_struct_header(type_ids_$struct.name$.type_identifier1(), detail_$struct.name$); } diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index d8fe424c..c5a8f087 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit d8fe424cd74e00781c815cb09139536cb13e5ee6 +Subproject commit c5a8f087ded0d3decd26e7a89db21b6b0d35563d