From 94389b12920e632b17c5a5e70b4b0aa00ac061d3 Mon Sep 17 00:00:00 2001
From: Vlad Didenko <business@didenko.com>
Date: Sun, 18 Sep 2016 19:39:29 -0500
Subject: [PATCH] [C++]: Simplify bool method returns

---
 .../uk/co/real_logic/sbe/generation/cpp/CppGenerator.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
index cf537252ba..339651e881 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -525,7 +525,7 @@ private void generateVarDataDescriptors(
             indent + "    }\n\n" +
             indent + "    bool %1$sInActingVersion(void)\n" +
             indent + "    {\n" +
-            indent + "        return (m_actingVersion >= %1$sSinceVersion()) ? true : false;\n" +
+            indent + "        return m_actingVersion >= %1$sSinceVersion();\n" +
             indent + "    }\n\n" +
             indent + "    static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
             indent + "    {\n" +
@@ -661,7 +661,7 @@ private CharSequence generateChoices(final String bitsetClassName, final List<To
                         "    bool %1$s(void) const\n" +
                         "    {\n" +
                         "%2$s" +
-                        "        return (%3$s(*((%4$s *)(m_buffer + m_offset))) & (0x1L << %5$s)) ? true : false;\n" +
+                        "        return %3$s(*((%4$s *)(m_buffer + m_offset))) & (0x1L << %5$s);\n" +
                         "    }\n\n",
                         choiceName,
                         generateChoiceNotPresentCondition(token.version(), BASE_INDENT),
@@ -1490,7 +1490,7 @@ private CharSequence generateFields(final String containingClassName, final List
                     indent + "    }\n\n" +
                     indent + "    bool %1$sInActingVersion(void)\n" +
                     indent + "    {\n" +
-                    indent + "        return (m_actingVersion >= %1$sSinceVersion()) ? true : false;\n" +
+                    indent + "        return m_actingVersion >= %1$sSinceVersion();\n" +
                     indent + "    }\n\n",
                     propertyName,
                     (long)signalToken.version()