@@ -1901,6 +1901,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
1901
1901
final String schemaIdType = cppTypeName (ir .headerStructure ().schemaIdType ());
1902
1902
final String schemaVersionType = cppTypeName (ir .headerStructure ().schemaVersionType ());
1903
1903
final String semanticType = token .encoding ().semanticType () == null ? "" : token .encoding ().semanticType ();
1904
+ final String headerType = ir .headerStructure ().tokens ().get (0 ).name ();
1904
1905
1905
1906
return String .format (
1906
1907
"private:\n " +
@@ -1933,6 +1934,8 @@ private CharSequence generateMessageFlyweightCode(final String className, final
1933
1934
" std::uint64_t uint_value;\n " +
1934
1935
" };\n \n " +
1935
1936
1937
+ " using messageHeader = %12$s;\n \n " +
1938
+
1936
1939
"%11$s" +
1937
1940
" SBE_NODISCARD static SBE_CONSTEXPR %1$s sbeBlockLength() SBE_NOEXCEPT\n " +
1938
1941
" {\n " +
@@ -1941,7 +1944,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
1941
1944
1942
1945
" SBE_NODISCARD static SBE_CONSTEXPR %1$s sbeBlockAndHeaderLength() SBE_NOEXCEPT\n " +
1943
1946
" {\n " +
1944
- " return MessageHeader ::encodedLength() + sbeBlockLength();\n " +
1947
+ " return messageHeader ::encodedLength() + sbeBlockLength();\n " +
1945
1948
" }\n \n " +
1946
1949
1947
1950
" SBE_NODISCARD static SBE_CONSTEXPR %3$s sbeTemplateId() SBE_NOEXCEPT\n " +
@@ -1977,7 +1980,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
1977
1980
" %10$s &wrapAndApplyHeader(" +
1978
1981
"char *buffer, const std::uint64_t offset, const std::uint64_t bufferLength)\n " +
1979
1982
" {\n " +
1980
- " MessageHeader hdr(buffer, offset, bufferLength, sbeSchemaVersion());\n \n " +
1983
+ " messageHeader hdr(buffer, offset, bufferLength, sbeSchemaVersion());\n \n " +
1981
1984
1982
1985
" hdr\n " +
1983
1986
" .blockLength(sbeBlockLength())\n " +
@@ -1987,7 +1990,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
1987
1990
1988
1991
" return *this = %10$s(\n " +
1989
1992
" buffer,\n " +
1990
- " offset + MessageHeader ::encodedLength(),\n " +
1993
+ " offset + messageHeader ::encodedLength(),\n " +
1991
1994
" bufferLength,\n " +
1992
1995
" sbeBlockLength(),\n " +
1993
1996
" sbeSchemaVersion());\n " +
@@ -2065,7 +2068,8 @@ private CharSequence generateMessageFlyweightCode(final String className, final
2065
2068
generateLiteral (ir .headerStructure ().schemaVersionType (), Integer .toString (ir .version ())),
2066
2069
semanticType ,
2067
2070
className ,
2068
- generateConstructorsAndOperators (className ));
2071
+ generateConstructorsAndOperators (className ),
2072
+ formatClassName (headerType ));
2069
2073
}
2070
2074
2071
2075
private void generateFields (
0 commit comments