Skip to content

Commit 569d5f6

Browse files
tmontgomerytmontgomery
authored
Merge pull request #384 from rigtorp/warn-extra
Enable extra warnings (-Wextra)
2 parents cc35b3b + 409b13a commit 569d5f6

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ set(GTEST_BINARY_DIR ${binary_dir})
4949
find_package(Threads)
5050

5151
if(UNIX)
52-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions -g -Wall -Wpedantic")
52+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fexceptions -g -Wall -Wpedantic -Wextra -Wno-unused-parameter")
5353
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
5454
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast")
5555
endif()

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

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,13 @@ private static void generateGroupClassHeader(
223223
indent + " inline void wrapForEncode(char *buffer, const %3$s count," +
224224
" std::uint64_t *pos, const std::uint64_t actingVersion, const std::uint64_t bufferLength)\n" +
225225
indent + " {\n" +
226+
indent + "#pragma GCC diagnostic push\n" +
227+
indent + "#pragma GCC diagnostic ignored \"-Wtype-limits\"\n" +
226228
indent + " if (count < %5$d || count > %6$d)\n" +
227229
indent + " {\n" +
228230
indent + " throw std::runtime_error(\"count outside of allowed range [E110]\");\n" +
229231
indent + " }\n" +
232+
indent + "#pragma GCC diagnostic pop\n" +
230233
indent + " m_buffer = buffer;\n" +
231234
indent + " m_bufferLength = bufferLength;\n" +
232235
indent + " m_dimensions.wrap(m_buffer, *pos, actingVersion, bufferLength);\n" +
@@ -244,11 +247,11 @@ private static void generateGroupClassHeader(
244247
numInGroupToken.encoding().applicableMaxValue().longValue()));
245248

246249
sb.append(String.format(
247-
indent + " static SBE_CONSTEXPR const std::uint64_t sbeHeaderSize()\n" +
250+
indent + " static SBE_CONSTEXPR std::uint64_t sbeHeaderSize()\n" +
248251
indent + " {\n" +
249252
indent + " return %1$d;\n" +
250253
indent + " }\n\n" +
251-
indent + " static SBE_CONSTEXPR const std::uint64_t sbeBlockLength()\n" +
254+
indent + " static SBE_CONSTEXPR std::uint64_t sbeBlockLength()\n" +
252255
indent + " {\n" +
253256
indent + " return %2$d;\n" +
254257
indent + " }\n\n" +
@@ -303,8 +306,7 @@ private static void generateGroupClassHeader(
303306
indent + " next(); func(*this);\n" +
304307
indent + " }\n" +
305308
indent + " }\n\n" +
306-
indent + "#endif\n\n",
307-
formatClassName(groupName)));
309+
indent + "#endif\n\n"));
308310
}
309311

310312
private static CharSequence generateGroupProperty(
@@ -325,7 +327,7 @@ private static CharSequence generateGroupProperty(
325327

326328
sb.append(String.format(
327329
"\n" +
328-
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
330+
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
329331
indent + " {\n" +
330332
indent + " return %2$d;\n" +
331333
indent + " }\n\n",
@@ -355,7 +357,7 @@ private static CharSequence generateGroupProperty(
355357
cppTypeForNumInGroup));
356358

357359
sb.append(String.format(
358-
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
360+
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
359361
indent + " {\n" +
360362
indent + " return %2$d;\n" +
361363
indent + " }\n\n" +
@@ -514,7 +516,7 @@ private void generateVarDataDescriptors(
514516
characterEncoding));
515517

516518
sb.append(String.format(
517-
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
519+
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
518520
indent + " {\n" +
519521
indent + " return %2$d;\n" +
520522
indent + " }\n\n" +
@@ -525,7 +527,7 @@ private void generateVarDataDescriptors(
525527
indent + " return m_actingVersion >= %1$sSinceVersion();\n" +
526528
indent + "#pragma GCC diagnostic pop\n" +
527529
indent + " }\n\n" +
528-
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
530+
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
529531
indent + " {\n" +
530532
indent + " return %3$d;\n" +
531533
indent + " }\n\n",
@@ -535,7 +537,7 @@ private void generateVarDataDescriptors(
535537

536538
sb.append(String.format(
537539
"\n" +
538-
indent + " static SBE_CONSTEXPR const std::uint64_t %sHeaderLength()\n" +
540+
indent + " static SBE_CONSTEXPR std::uint64_t %sHeaderLength()\n" +
539541
indent + " {\n" +
540542
indent + " return %d;\n" +
541543
indent + " }\n",
@@ -950,7 +952,7 @@ private CharSequence generatePrimitiveFieldMetaData(
950952

951953
sb.append(String.format(
952954
"\n" +
953-
indent + " static SBE_CONSTEXPR const %1$s %2$sNullValue()\n" +
955+
indent + " static SBE_CONSTEXPR %1$s %2$sNullValue()\n" +
954956
indent + " {\n" +
955957
indent + " return %3$s;\n" +
956958
indent + " }\n",
@@ -960,7 +962,7 @@ private CharSequence generatePrimitiveFieldMetaData(
960962

961963
sb.append(String.format(
962964
"\n" +
963-
indent + " static SBE_CONSTEXPR const %1$s %2$sMinValue()\n" +
965+
indent + " static SBE_CONSTEXPR %1$s %2$sMinValue()\n" +
964966
indent + " {\n" +
965967
indent + " return %3$s;\n" +
966968
indent + " }\n",
@@ -970,7 +972,7 @@ private CharSequence generatePrimitiveFieldMetaData(
970972

971973
sb.append(String.format(
972974
"\n" +
973-
indent + " static SBE_CONSTEXPR const %1$s %2$sMaxValue()\n" +
975+
indent + " static SBE_CONSTEXPR %1$s %2$sMaxValue()\n" +
974976
indent + " {\n" +
975977
indent + " return %3$s;\n" +
976978
indent + " }\n",
@@ -980,7 +982,7 @@ private CharSequence generatePrimitiveFieldMetaData(
980982

981983
sb.append(String.format(
982984
"\n" +
983-
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
985+
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
984986
indent + " {\n" +
985987
indent + " return %2$d;\n" +
986988
indent + " }\n",
@@ -1035,7 +1037,7 @@ private CharSequence generateArrayProperty(
10351037

10361038
sb.append(String.format(
10371039
"\n" +
1038-
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sLength(void)\n" +
1040+
indent + " static SBE_CONSTEXPR std::uint64_t %1$sLength(void)\n" +
10391041
indent + " {\n" +
10401042
indent + " return %2$d;\n" +
10411043
indent + " }\n\n",
@@ -1149,7 +1151,7 @@ private CharSequence generateConstPropertyMethods(
11491151
{
11501152
return String.format(
11511153
"\n" +
1152-
indent + " static SBE_CONSTEXPR const %1$s %2$s(void)\n" +
1154+
indent + " static SBE_CONSTEXPR %1$s %2$s(void)\n" +
11531155
indent + " {\n" +
11541156
indent + " return %3$s;\n" +
11551157
indent + " }\n",
@@ -1174,7 +1176,7 @@ private CharSequence generateConstPropertyMethods(
11741176

11751177
sb.append(String.format(
11761178
"\n" +
1177-
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sLength(void)\n" +
1179+
indent + " static SBE_CONSTEXPR std::uint64_t %1$sLength(void)\n" +
11781180
indent + " {\n" +
11791181
indent + " return %2$d;\n" +
11801182
indent + " }\n\n",
@@ -1248,7 +1250,7 @@ private static CharSequence generateFixedFlyweightCode(final String className, f
12481250
" reset(buffer, offset, bufferLength, actingVersion);\n" +
12491251
" return *this;\n" +
12501252
" }\n\n" +
1251-
" static SBE_CONSTEXPR const std::uint64_t encodedLength(void)\n" +
1253+
" static SBE_CONSTEXPR std::uint64_t encodedLength(void)\n" +
12521254
" {\n" +
12531255
" return %2$s;\n" +
12541256
" }\n\n" +
@@ -1311,19 +1313,19 @@ private CharSequence generateMessageFlyweightCode(final String className, final
13111313
" }\n\n" +
13121314
"public:\n\n" +
13131315
"%11$s" +
1314-
" static SBE_CONSTEXPR const %1$s sbeBlockLength(void)\n" +
1316+
" static SBE_CONSTEXPR %1$s sbeBlockLength(void)\n" +
13151317
" {\n" +
13161318
" return %2$s;\n" +
13171319
" }\n\n" +
1318-
" static SBE_CONSTEXPR const %3$s sbeTemplateId(void)\n" +
1320+
" static SBE_CONSTEXPR %3$s sbeTemplateId(void)\n" +
13191321
" {\n" +
13201322
" return %4$s;\n" +
13211323
" }\n\n" +
1322-
" static SBE_CONSTEXPR const %5$s sbeSchemaId(void)\n" +
1324+
" static SBE_CONSTEXPR %5$s sbeSchemaId(void)\n" +
13231325
" {\n" +
13241326
" return %6$s;\n" +
13251327
" }\n\n" +
1326-
" static SBE_CONSTEXPR const %7$s sbeSchemaVersion(void)\n" +
1328+
" static SBE_CONSTEXPR %7$s sbeSchemaVersion(void)\n" +
13271329
" {\n" +
13281330
" return %8$s;\n" +
13291331
" }\n\n" +
@@ -1398,15 +1400,15 @@ private CharSequence generateFields(final String containingClassName, final List
13981400

13991401
sb.append(String.format(
14001402
"\n" +
1401-
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
1403+
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
14021404
indent + " {\n" +
14031405
indent + " return %2$d;\n" +
14041406
indent + " }\n\n",
14051407
propertyName,
14061408
signalToken.id()));
14071409

14081410
sb.append(String.format(
1409-
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
1411+
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
14101412
indent + " {\n" +
14111413
indent + " return %2$d;\n" +
14121414
indent + " }\n\n" +
@@ -1421,7 +1423,7 @@ private CharSequence generateFields(final String containingClassName, final List
14211423
signalToken.version()));
14221424

14231425
sb.append(String.format(
1424-
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingOffset(void)\n" +
1426+
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingOffset(void)\n" +
14251427
indent + " {\n" +
14261428
indent + " return %2$d;\n" +
14271429
indent + " }\n\n",
@@ -1560,7 +1562,7 @@ private CharSequence generateEnumProperty(
15601562
formatByteOrderEncoding(token.encoding().byteOrder(), token.encoding().primitiveType())));
15611563

15621564
sb.append(String.format(
1563-
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
1565+
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
15641566
indent + " {\n" +
15651567
indent + " return %2$d;\n" +
15661568
indent + " }\n",
@@ -1599,7 +1601,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
15991601

16001602
sb.append(String.format(
16011603
"\n" +
1602-
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
1604+
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
16031605
indent + " {\n" +
16041606
indent + " return %2$d;\n" +
16051607
indent + " }\n",

0 commit comments

Comments
 (0)