Skip to content

Commit 9434c64

Browse files
author
Olivier Deheurles
committed
Merge pull request aeron-io#105 from qed-/sbetool
SbeTool generates uncompilable C# code in some cases
2 parents f803d03 + 6fbe048 commit 9434c64

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,9 +704,9 @@ private CharSequence generateFieldNotPresentCondition(final int sinceVersion, fi
704704
}
705705

706706
return String.format(
707-
indent + " if (actingVersion < %1$d) return %2$s;\n\n",
707+
indent + " if (_actingVersion < %1$d) return %2$s;\n\n",
708708
Integer.valueOf(sinceVersion),
709-
sinceVersion > 0 ? generateLiteral(encoding.primitiveType(), encoding.nullValue().toString()) : "(byte)0"
709+
sinceVersion > 0 ? generateLiteral(encoding.primitiveType(), encoding.applicableNullValue().toString()) : "(byte)0"
710710
);
711711
}
712712

@@ -1096,7 +1096,7 @@ private CharSequence generateEnumFieldNotPresentCondition(final int sinceVersion
10961096
}
10971097

10981098
return String.format(
1099-
indent + " if (actingVersion_ < %d) return %s.NULL_VALUE;\n\n",
1099+
indent + " if (_actingVersion < %d) return %s.NULL_VALUE;\n\n",
11001100
Integer.valueOf(sinceVersion),
11011101
enumName
11021102
);
@@ -1106,7 +1106,7 @@ private CharSequence generateEnumProperty(final String propertyName,
11061106
final Token token,
11071107
final String indent)
11081108
{
1109-
final String enumName = token.name();
1109+
final String enumName = formatClassName(token.name());
11101110
final String typePrefix = toUpperFirstChar(token.encoding().primitiveType().primitiveName());
11111111
final String enumUnderlyingType = cSharpTypeName(token.encoding().primitiveType());
11121112
final Integer offset = Integer.valueOf(token.offset());

0 commit comments

Comments
 (0)