Skip to content

[C++]: More constexpr's where possible #366

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2016
Merged

[C++]: More constexpr's where possible #366

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
28 changes: 14 additions & 14 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 @@ -257,11 +257,11 @@ private static void generateGroupClassHeader(
numInGroupToken.encoding().applicableMaxValue().longValue()));

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

sb.append(String.format(
"\n" +
indent + " static const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONST_KIND std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand Down Expand Up @@ -520,15 +520,15 @@ private void generateVarDataDescriptors(
));

sb.append(String.format(
indent + " static const std::uint64_t %1$sSinceVersion(void)\n" +
indent + " static SBE_CONST_KIND std::uint64_t %1$sSinceVersion(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n" +
indent + " bool %1$sInActingVersion(void)\n" +
indent + " {\n" +
indent + " return (m_actingVersion >= %1$sSinceVersion()) ? true : false;\n" +
indent + " }\n\n" +
indent + " static const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONST_KIND std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %3$d;\n" +
indent + " }\n\n",
Expand All @@ -539,7 +539,7 @@ private void generateVarDataDescriptors(

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

sb.append(String.format(
"\n" +
indent + " static const %1$s %2$sNullValue()\n" +
indent + " static SBE_CONST_KIND %1$s %2$sNullValue()\n" +
indent + " {\n" +
indent + " return %3$s;\n" +
indent + " }\n",
Expand All @@ -1009,7 +1009,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f

sb.append(String.format(
"\n" +
indent + " static const %1$s %2$sMinValue()\n" +
indent + " static SBE_CONST_KIND %1$s %2$sMinValue()\n" +
indent + " {\n" +
indent + " return %3$s;\n" +
indent + " }\n",
Expand All @@ -1020,7 +1020,7 @@ private CharSequence generatePrimitiveFieldMetaData(final String propertyName, f

sb.append(String.format(
"\n" +
indent + " static const %1$s %2$sMaxValue()\n" +
indent + " static SBE_CONST_KIND %1$s %2$sMaxValue()\n" +
indent + " {\n" +
indent + " return %3$s;\n" +
indent + " }\n",
Expand Down Expand Up @@ -1079,7 +1079,7 @@ private CharSequence generateArrayProperty(

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

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

sb.append(String.format(
"\n" +
indent + " static const std::uint16_t %1$sId(void)\n" +
indent + " static SBE_CONST_KIND std::uint16_t %1$sId(void)\n" +
indent + " {\n" +
indent + " return %2$d;\n" +
indent + " }\n\n",
Expand All @@ -1507,7 +1507,7 @@ private CharSequence generateFields(final String containingClassName, final List
));

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