Skip to content

Commit a601c48

Browse files
author
Todd L. Montgomery
committed
[C++]: fixed aeron-io#195 by adding const to static generated methods
1 parent 998be77 commit a601c48

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

main/java/uk/co/real_logic/sbe/generation/cpp98/Cpp98Generator.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,15 @@ private void generateGroupClassHeader(final StringBuilder sb,
257257
));
258258

259259
sb.append(String.format(
260-
indent + " static int sbeHeaderSize()\n" +
260+
indent + " static const int sbeHeaderSize()\n" +
261261
indent + " {\n" +
262262
indent + " return %d;\n" +
263263
indent + " }\n\n",
264264
dimensionHeaderSize
265265
));
266266

267267
sb.append(String.format(
268-
indent + " static int sbeBlockLength()\n" +
268+
indent + " static const int sbeBlockLength()\n" +
269269
indent + " {\n" +
270270
indent + " return %d;\n" +
271271
indent + " }\n\n",
@@ -319,7 +319,7 @@ private CharSequence generateGroupProperty(final String groupName,
319319

320320
sb.append(String.format(
321321
"\n" +
322-
indent + " static int %1$sId(void)\n" +
322+
indent + " static const int %1$sId(void)\n" +
323323
indent + " {\n" +
324324
indent + " return %2$d;\n" +
325325
indent + " }\n\n",
@@ -448,15 +448,15 @@ private void generateVarDataDecriptors(final StringBuilder sb,
448448
));
449449

450450
sb.append(String.format(
451-
" static int %1$sSinceVersion(void)\n" +
451+
" static const int %1$sSinceVersion(void)\n" +
452452
" {\n" +
453453
" return %2$d;\n" +
454454
" }\n\n" +
455455
" bool %1$sInActingVersion(void)\n" +
456456
" {\n" +
457457
" return (actingVersion_ >= %2$s) ? true : false;\n" +
458458
" }\n\n" +
459-
" static int %1$sId(void)\n" +
459+
" static const int %1$sId(void)\n" +
460460
" {\n" +
461461
" return %3$d;\n" +
462462
" }\n\n",
@@ -468,7 +468,7 @@ private void generateVarDataDecriptors(final StringBuilder sb,
468468

469469
sb.append(String.format(
470470
"\n" +
471-
" static int %sHeaderSize()\n" +
471+
" static const int %sHeaderSize()\n" +
472472
" {\n" +
473473
" return %d;\n" +
474474
" }\n",
@@ -854,7 +854,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f
854854

855855
sb.append(String.format(
856856
"\n" +
857-
indent + " static %1$s %2$sNullValue()\n" +
857+
indent + " static const %1$s %2$sNullValue()\n" +
858858
indent + " {\n" +
859859
indent + " return %3$s;\n" +
860860
indent + " }\n",
@@ -865,7 +865,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f
865865

866866
sb.append(String.format(
867867
"\n" +
868-
indent + " static %1$s %2$sMinValue()\n" +
868+
indent + " static const %1$s %2$sMinValue()\n" +
869869
indent + " {\n" +
870870
indent + " return %3$s;\n" +
871871
indent + " }\n",
@@ -876,7 +876,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f
876876

877877
sb.append(String.format(
878878
"\n" +
879-
indent + " static %1$s %2$sMaxValue()\n" +
879+
indent + " static const %1$s %2$sMaxValue()\n" +
880880
indent + " {\n" +
881881
indent + " return %3$s;\n" +
882882
indent + " }\n",
@@ -940,7 +940,7 @@ private CharSequence generateArrayProperty(final String containingClassName,
940940

941941
sb.append(String.format(
942942
"\n" +
943-
indent + " static int %1$sLength(void)\n" +
943+
indent + " static const int %1$sLength(void)\n" +
944944
indent + " {\n" +
945945
indent + " return %2$d;\n" +
946946
indent + " }\n\n",
@@ -1060,7 +1060,7 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin
10601060

10611061
sb.append(String.format(
10621062
"\n" +
1063-
indent + " static int %1$sLength(void)\n" +
1063+
indent + " static const int %1$sLength(void)\n" +
10641064
indent + " {\n" +
10651065
indent + " return %2$d;\n" +
10661066
indent + " }\n\n",
@@ -1124,7 +1124,7 @@ private CharSequence generateFixedFlyweightCode(final String className, final in
11241124
" actingVersion_ = actingVersion;\n" +
11251125
" return *this;\n" +
11261126
" }\n\n" +
1127-
" static int size(void)\n" +
1127+
" static const int size(void)\n" +
11281128
" {\n" +
11291129
" return %2$s;\n" +
11301130
" }\n\n",
@@ -1153,19 +1153,19 @@ private CharSequence generateMessageFlyweightCode(final String className, final
11531153
" %10$s(const %10$s&) {}\n\n" +
11541154
"public:\n\n" +
11551155
" %10$s(void) : buffer_(NULL), bufferLength_(0), offset_(0) {}\n\n" +
1156-
" static %1$s sbeBlockLength(void)\n" +
1156+
" static const %1$s sbeBlockLength(void)\n" +
11571157
" {\n" +
11581158
" return %2$s;\n" +
11591159
" }\n\n" +
1160-
" static %3$s sbeTemplateId(void)\n" +
1160+
" static const %3$s sbeTemplateId(void)\n" +
11611161
" {\n" +
11621162
" return %4$s;\n" +
11631163
" }\n\n" +
1164-
" static %5$s sbeSchemaId(void)\n" +
1164+
" static const %5$s sbeSchemaId(void)\n" +
11651165
" {\n" +
11661166
" return %6$s;\n" +
11671167
" }\n\n" +
1168-
" static %7$s sbeSchemaVersion(void)\n" +
1168+
" static const %7$s sbeSchemaVersion(void)\n" +
11691169
" {\n" +
11701170
" return %8$s;\n" +
11711171
" }\n\n" +
@@ -1253,7 +1253,7 @@ private CharSequence generateFields(final String containingClassName,
12531253

12541254
sb.append(String.format(
12551255
"\n" +
1256-
indent + " static int %1$sId(void)\n" +
1256+
indent + " static const int %1$sId(void)\n" +
12571257
indent + " {\n" +
12581258
indent + " return %2$d;\n" +
12591259
indent + " }\n\n",
@@ -1262,7 +1262,7 @@ private CharSequence generateFields(final String containingClassName,
12621262
));
12631263

12641264
sb.append(String.format(
1265-
indent + " static int %1$sSinceVersion(void)\n" +
1265+
indent + " static const int %1$sSinceVersion(void)\n" +
12661266
indent + " {\n" +
12671267
indent + " return %2$d;\n" +
12681268
indent + " }\n\n" +

0 commit comments

Comments
 (0)