Fix windows warning with an union with boolean discriminator [20975] (#…

…339) * Refs 20973. Fix windows warning Signed-off-by: Ricardo González Moreno <[email protected]> * Refs 20973. Update submodule Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · May 9, 2024 · 0bafbd7 · 0bafbd7
1 parent 9062ad3
commit 0bafbd7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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
@@ -473,7 +473,7 @@ public:
 
     $union.members: { member | $public_union_member_declaration(union, member)$}; separator="\n"$
 
-    $if(!union.defaultMember)$
+    $if(union.needDefaultCase)$
     void _default()
     {
         if (member_destructor_)

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg
@@ -259,7 +259,7 @@ eProsima_user_DllExport size_t calculate_serialized_size(
                         data.$member.name$(), current_alignment);
             break;
         }; separator="\n"$
-        $if(!union.defaultMember)$
+        $if(union.needDefaultCase)$
         default:
             break;
         $endif$
@@ -298,7 +298,7 @@ eProsima_user_DllExport void serialize(
             scdr << eprosima::fastcdr::MemberId($if(union.annotationMutable)$$member.id$$else$$member.index$$endif$) << data.$member.name$();
             break;
         }; separator="\n"$
-        $if(!union.defaultMember)$
+        $if(union.needDefaultCase)$
         default:
             break;
         $endif$
@@ -339,7 +339,7 @@ eProsima_user_DllExport void deserialize(
                                 break;
                             \}
                         }; separator="\n"$
-                        $if(!union.defaultMember)$
+                        $if(union.needDefaultCase)$
                         default:
                             data._default();
                             break;
@@ -362,7 +362,7 @@ eProsima_user_DllExport void deserialize(
                             dcdr \>> data.$member.name$();
                             break;
                         }; separator="\n"$
-                        $if(!union.defaultMember)$
+                        $if(union.needDefaultCase)$
                         default:
                             break;
                         $endif$

diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser