Refs #19236: fix bitmask tests after rebase

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
eProsima · Sep 12, 2023 · 5b33004 · 5b33004
1 parent 84a3c1b
commit 5b33004
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 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
@@ -708,7 +708,7 @@ eProsima_user_DllExport void $member.name$(
 eProsima_user_DllExport bool $member.name$() const;
 >>
 
-member_default_init(member) ::= <<%
+member_default_init(member) ::= <%
 $if(!member.typecode.forwarded)$
 $if(member.annotationDefault)$
  {$member.annotationDefaultValue$}

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg
@@ -327,13 +327,9 @@ template<>
 eProsima_user_DllExport size_t calculate_serialized_size(
         eprosima::fastcdr::CdrSizeCalculator& calculator,
         const $bitmask.scopedname$& data,
-        size_t current_alignment)
+        size_t& current_alignment)
 {
-    size_t initial_alignment = current_alignment;
-
-    current_alignment += calculator.calculate_serialized_size(data.bitmask(), current_alignment);
-
-    return current_alignment - initial_alignment;
+    return calculator.calculate_serialized_size(data.bitmask(), current_alignment);
 }
 $endif$