[C++]: replace message header specific generation with general composite generation.

Author: tmontgomery

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

@@ -51,20 +51,7 @@ public CppGenerator(final Ir ir, final OutputManager outputManager)
 
  public void generateMessageHeaderStub() throws IOException
  {
- final String messageHeader = "MessageHeader";
-
- try (Writer out = outputManager.createOutput(messageHeader))
- {
- final List<Token> tokens = ir.headerStructure().tokens();
- out.append(generateFileHeader(ir.namespaces(), messageHeader,
- generateTypesToIncludes(tokens.subList(1, tokens.size() - 1))));
- out.append(generateClassDeclaration(messageHeader));
- out.append(generateFixedFlyweightCode(messageHeader, tokens.get(0).encodedLength()));
- out.append(generateCompositePropertyElements(
- messageHeader, tokens.subList(1, tokens.size() - 1), BASE_INDENT));
- out.append("};\n");
- out.append(CppUtil.closingBraces(ir.namespaces().length)).append("#endif\n");
- }
+ generateComposite(ir.headerStructure().tokens());
  }
 
  public List<String> generateTypeStubs() throws IOException

sbe-tool/src/test/resources/code-generation-schema.xml

@@ -7,6 +7,15 @@
  description="Example schema"
  byteOrder="littleEndian">
  <types>
+ <composite name="BoosterT">
+ <enum name="BoostType" encodingType="char">
+ <validValue name="TURBO">T</validValue>
+ <validValue name="SUPERCHARGER">S</validValue>
+ <validValue name="NITROUS">N</validValue>
+ <validValue name="KERS">K</validValue>
+ </enum>
+ <type name="horsePower" primitiveType="uint8"/>
+ </composite>
  <composite name="messageHeader" description="Message identifiers and length of message root">
  <type name="blockLength" primitiveType="uint16"/>
  <type name="templateId" primitiveType="uint16"/>
@@ -27,15 +36,6 @@
  <type name="VehicleCode" primitiveType="char" length="6" characterEncoding="ASCII"/>
  <type name="someNumbers" primitiveType="int32" length="5"/>
  <type name="Ron" primitiveType="uint8" minValue="90" maxValue="110"/>
- <composite name="BoosterT">
- <enum name="BoostType" encodingType="char">
- <validValue name="TURBO">T</validValue>
- <validValue name="SUPERCHARGER">S</validValue>
- <validValue name="NITROUS">N</validValue>
- <validValue name="KERS">K</validValue>
- </enum>
- <type name="horsePower" primitiveType="uint8"/>
- </composite>
  <composite name="Engine">
  <type name="capacity" primitiveType="uint16"/>
  <type name="numCylinders" primitiveType="uint8"/>