Skip to content

[C++]: Remove const qualifiers where they have no effect #421

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

[C++]: Remove const qualifiers where they have no effect #421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ private static void generateGroupClassHeader(
numInGroupToken.encoding().applicableMaxValue().longValue()));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::uint64_t sbeHeaderSize()\n" +
indent + " static SBE_CONSTEXPR std::uint64_t sbeHeaderSize()\n" +
indent + " {\n" +
indent + " return %1$d;\n" +
indent + " }\n\n" +
indent + " static SBE_CONSTEXPR const std::uint64_t sbeBlockLength()\n" +
indent + " static SBE_CONSTEXPR std::uint64_t sbeBlockLength()\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n" +
Expand Down Expand Up @@ -337,7 +337,7 @@ private static CharSequence generateGroupProperty(

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -369,7 +369,7 @@ private static CharSequence generateGroupProperty(
));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n" +
Expand Down Expand Up @@ -464,15 +464,15 @@ private CharSequence generateVarData(final String className, final List<Token> t
));

sb.append(String.format(
indent + " const std::string get%1$sAsString()\n" +
indent + " std::string get%1$sAsString()\n" +
indent + " {\n" +
"%2$s" +
indent + " std::uint64_t lengthOfLengthField = %3$d;\n" +
indent + " std::uint64_t lengthPosition = position();\n" +
indent + " position(lengthPosition + lengthOfLengthField);\n" +
indent + " std::uint64_t dataLength = %4$s(*((%5$s *)(m_buffer + lengthPosition)));\n" +
indent + " std::uint64_t pos = position();\n" +
indent + " const std::string result(m_buffer + pos, dataLength);\n" +
indent + " std::string result(m_buffer + pos, dataLength);\n" +
indent + " position(position() + dataLength);\n" +
indent + " return result;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -534,7 +534,7 @@ private void generateVarDataDescriptors(
));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n" +
Expand All @@ -545,7 +545,7 @@ private void generateVarDataDescriptors(
indent + " return m_actingVersion >= %1$sSinceVersion();\n" +
indent + "#pragma GCC diagnostic pop\n" +
indent + " }\n\n" +
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %3$d;\n" +
indent + " }\n\n",
Expand All @@ -556,7 +556,7 @@ private void generateVarDataDescriptors(

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::uint64_t %sHeaderLength()\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %sHeaderLength()\n" +
indent + " {\n" +
indent + " return %d;\n" +
indent + " }\n",
Expand Down Expand Up @@ -1011,7 +1011,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n",
Expand Down Expand Up @@ -1066,7 +1066,7 @@ private CharSequence generateArrayProperty(

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sLength(void)\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %1$sLength(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -1204,7 +1204,7 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sLength(void)\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %1$sLength(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -1278,7 +1278,7 @@ private static CharSequence generateFixedFlyweightCode(final String className, f
" reset(buffer, offset, bufferLength, actingVersion);\n" +
" return *this;\n" +
" }\n\n" +
" static SBE_CONSTEXPR const std::uint64_t encodedLength(void)\n" +
" static SBE_CONSTEXPR std::uint64_t encodedLength(void)\n" +
" {\n" +
" return %2$s;\n" +
" }\n\n" +
Expand Down Expand Up @@ -1428,15 +1428,15 @@ private CharSequence generateFields(final String containingClassName, final List

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONSTEXPR std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
propertyName,
signalToken.id()));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::uint64_t %1$sSinceVersion(void)\n" +
indent + " static SBE_CONSTEXPR std::uint64_t %1$sSinceVersion(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n" +
Expand All @@ -1451,7 +1451,7 @@ private CharSequence generateFields(final String containingClassName, final List
(long)signalToken.version()));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingOffset(void)\n" +
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingOffset(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -1587,7 +1587,7 @@ private CharSequence generateEnumProperty(
formatByteOrderEncoding(token.encoding().byteOrder(), token.encoding().primitiveType())));

sb.append(String.format(
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n",
Expand Down Expand Up @@ -1626,7 +1626,7 @@ private static Object generateBitsetProperty(final String propertyName, final To

sb.append(String.format(
"\n" +
indent + " static SBE_CONSTEXPR const std::size_t %1$sEncodingLength(void)\n" +
indent + " static SBE_CONSTEXPR std::size_t %1$sEncodingLength(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n",
Expand Down