Skip to content

Commit 9d4834c

Browse files
committed
[C/C++] Fix implicit conversion of integers to booleans.
1 parent fad4b6b commit 9d4834c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ private CharSequence generateChoices(final String bitsetStructName, final List<T
910910
sb.append(String.format("\n" +
911911
"SBE_ONE_DEF bool %1$s_check_%2$s_bit(const %3$s bits)\n" +
912912
"{\n" +
913-
" return bits & ((%3$s)1 << %4$s);\n" +
913+
" return (bits & ((%3$s)1 << %4$s)) != 0;\n" +
914914
"}\n",
915915
bitsetStructName,
916916
choiceName,
@@ -934,7 +934,7 @@ private CharSequence generateChoices(final String bitsetStructName, final List<T
934934
"%3$s" +
935935
" %5$s val;\n" +
936936
" memcpy(&val, codec->buffer + codec->offset, sizeof(%5$s));\n" +
937-
" return %4$s(val) & ((%5$s)1 << %6$s);\n" +
937+
" return (%4$s(val) & ((%5$s)1 << %6$s)) != 0;\n" +
938938
"}\n",
939939
bitsetStructName,
940940
choiceName,

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ private CharSequence generateChoices(final String bitsetClassName, final List<To
736736
sb.append(String.format("\n" +
737737
" static bool %1$s(const %2$s bits)\n" +
738738
" {\n" +
739-
" return bits & (static_cast<%2$s>(1) << %3$s);\n" +
739+
" return (bits & (static_cast<%2$s>(1) << %3$s)) != 0;\n" +
740740
" }\n",
741741
choiceName,
742742
typeName,
@@ -758,7 +758,7 @@ private CharSequence generateChoices(final String bitsetClassName, final List<To
758758
"%2$s" +
759759
" %4$s val;\n" +
760760
" std::memcpy(&val, m_buffer + m_offset, sizeof(%4$s));\n" +
761-
" return %3$s(val) & (static_cast<%4$s>(1) << %5$s);\n" +
761+
" return (%3$s(val) & (static_cast<%4$s>(1) << %5$s)) != 0;\n" +
762762
" }\n",
763763
choiceName,
764764
generateChoiceNotPresentCondition(token.version(), BASE_INDENT),

0 commit comments

Comments
 (0)