[Java] Fix SBE_SEMANTIC_VERSION field generation for C++.

Author: vyazelenko

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

@@ -169,7 +169,6 @@ public void generate() throws IOException
                 generateDisplay(sb, msgToken.name(), fields, groups, varData);
                 sb.append(generateMessageLength(groups, varData, BASE_INDENT));
                 sb.append("};\n");
-                sb.append(generateStaticVariablesInitialization(className));
                 sb.append(CppUtil.closingBraces(ir.namespaces().length)).append("#endif\n");
                 out.append(sb);
             }
@@ -1995,7 +1994,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
             "    static const %3$s SBE_TEMPLATE_ID = %4$s;\n" +
             "    static const %5$s SBE_SCHEMA_ID = %6$s;\n" +
             "    static const %7$s SBE_SCHEMA_VERSION = %8$s;\n" +
-            "    static const char* SBE_SEMANTIC_VERSION;\n\n" +
+            "    static constexpr const char* SBE_SEMANTIC_VERSION = \"%13$s\";\n\n" +
 
             "    enum MetaAttribute\n" +
             "    {\n" +
@@ -3193,15 +3192,4 @@ private CharSequence generateMessageLength(final List<Token> groups, final List<
 
         return sb;
     }
-
-    private CharSequence generateStaticVariablesInitialization(final String className)
-    {
-        final String semanticVersion = ir.semanticVersion() == null ? "" : ir.semanticVersion();
-
-        return String.format(
-            "\n" +
-            "const char* %1$s::SBE_SEMANTIC_VERSION = \"%2$s\";\n\n",
-            className,
-            semanticVersion);
-    }
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/cpp/CppGeneratorTest.java

@@ -52,4 +52,24 @@ void shouldUseGeneratedLiteralForConstantOneWhenGeneratingBitsetCode() throws Ex
             assertThat(source, containsString("UINT64_C(0x1) << "));
         }
     }
+
+    @Test
+    void shouldUseConstexprWhenInitializingSemanticVersion() throws Exception
+    {
+        try (InputStream in = Tests.getLocalResource("code-generation-schema.xml"))
+        {
+            final ParserOptions options = ParserOptions.builder().stopOnError(true).build();
+            final MessageSchema schema = parse(in, options);
+            final IrGenerator irg = new IrGenerator();
+            final Ir ir = irg.generate(schema);
+            final StringWriterOutputManager outputManager = new StringWriterOutputManager();
+            outputManager.setPackageName(ir.applicableNamespace());
+
+            final CppGenerator generator = new CppGenerator(ir, false, outputManager);
+            generator.generate();
+
+            final String source = outputManager.getSource("code.generation.test.Car").toString();
+            assertThat(source, containsString("static constexpr const char* SBE_SEMANTIC_VERSION = \"5.2\""));
+        }
+    }
 }

version.txt

@@ -1 +1 @@
-1.29.0-SNAPSHOT
+1.28.1-SNAPSHOT