Skip to content

Commit 25cfc90

Browse files
richiwareEduPonz
authored andcommitted
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]>
1 parent 2a40f90 commit 25cfc90

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public:
473473

474474
$union.members: { member | $public_union_member_declaration(union, member)$}; separator="\n"$
475475

476-
$if(!union.defaultMember)$
476+
$if(union.needDefaultCase)$
477477
void _default()
478478
{
479479
if (member_destructor_)

src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ eProsima_user_DllExport size_t calculate_serialized_size(
259259
data.$member.name$(), current_alignment);
260260
break;
261261
}; separator="\n"$
262-
$if(!union.defaultMember)$
262+
$if(union.needDefaultCase)$
263263
default:
264264
break;
265265
$endif$
@@ -298,7 +298,7 @@ eProsima_user_DllExport void serialize(
298298
scdr << eprosima::fastcdr::MemberId($if(union.annotationMutable)$$member.id$$else$$member.index$$endif$) << data.$member.name$();
299299
break;
300300
}; separator="\n"$
301-
$if(!union.defaultMember)$
301+
$if(union.needDefaultCase)$
302302
default:
303303
break;
304304
$endif$
@@ -339,7 +339,7 @@ eProsima_user_DllExport void deserialize(
339339
break;
340340
\}
341341
}; separator="\n"$
342-
$if(!union.defaultMember)$
342+
$if(union.needDefaultCase)$
343343
default:
344344
data._default();
345345
break;
@@ -362,7 +362,7 @@ eProsima_user_DllExport void deserialize(
362362
dcdr \>> data.$member.name$();
363363
break;
364364
}; separator="\n"$
365-
$if(!union.defaultMember)$
365+
$if(union.needDefaultCase)$
366366
default:
367367
break;
368368
$endif$

0 commit comments

Comments
 (0)