Skip to content

Commit 47226c4

Browse files
committed
[Java] Prefix with Sbe so we have SbeSchemaId and SbeSchemaVersion in generated codec for CSharp.
1 parent 2f699f6 commit 47226c4

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,13 +1029,10 @@ private CharSequence generateByteLiteralList(final byte[] bytes)
10291029

10301030
private CharSequence generateFixedFlyweightCode(final int size)
10311031
{
1032-
final String schemaIdType = cSharpTypeName(ir.headerStructure().schemaIdType());
1033-
final String schemaVersionType = cSharpTypeName(ir.headerStructure().schemaVersionType());
1034-
10351032
return String.format(
1036-
INDENT + INDENT + "public const %1$s SchemaId = %2$s;\n" +
1037-
INDENT + INDENT + "public const %3$s SchemaVersion = %4$s;\n" +
1038-
INDENT + INDENT + "public const int Size = %5$d;\n\n",
1033+
INDENT + INDENT + "public const %1$s SbeSchemaId = %2$s;\n" +
1034+
INDENT + INDENT + "public const %3$s SbeSchemaVersion = %4$s;\n" +
1035+
INDENT + INDENT + "public const int Size = %5$d;\n\n" +
10391036

10401037
INDENT + INDENT + "private DirectBuffer _buffer;\n" +
10411038
INDENT + INDENT + "private int _offset;\n" +
@@ -1046,10 +1043,10 @@ private CharSequence generateFixedFlyweightCode(final int size)
10461043
INDENT + INDENT + INDENT + "_offset = offset;\n" +
10471044
INDENT + INDENT + INDENT + "_actingVersion = actingVersion;\n" +
10481045
INDENT + INDENT + INDENT + "_buffer = buffer;\n" +
1049-
INDENT + INDENT + "}\n\n" +
1050-
schemaIdType,
1046+
INDENT + INDENT + "}\n\n",
1047+
cSharpTypeName(ir.headerStructure().schemaIdType()),
10511048
generateLiteral(ir.headerStructure().schemaIdType(), Integer.toString(ir.id())),
1052-
schemaVersionType,
1049+
cSharpTypeName(ir.headerStructure().schemaVersionType()),
10531050
generateLiteral(ir.headerStructure().schemaVersionType(), Integer.toString(ir.version())),
10541051
size);
10551052
}

0 commit comments

Comments
 (0)