Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ private void generateGroupClassHeader(

if (null != fieldPrecedenceModel)
{
sb.append("#if defined(").append(precedenceChecksFlagName).append(")\n");
new Formatter(sb).format(
indent + " CodecState *m_codecStatePtr = nullptr;\n\n" +

Expand All @@ -710,19 +711,38 @@ private void generateGroupClassHeader(
indent + " void codecState(CodecState codecState)\n" +
indent + " {\n" +
indent + " *m_codecStatePtr = codecState;\n" +
indent + " }\n\n"
indent + " }\n"
);
sb.append("#else\n");
new Formatter(sb).format(
indent + " CodecState codecState() const SBE_NOEXCEPT\n" +
indent + " {\n" +
indent + " return " + qualifiedStateCase(fieldPrecedenceModel.notWrappedState()) + ";\n" +
indent + " }\n\n" +

indent + " CodecState *codecStatePtr()\n" +
indent + " {\n" +
indent + " return nullptr;\n" +
indent + " }\n\n" +

indent + " void codecState(CodecState codecState)\n" +
indent + " {\n" +
indent + " }\n"
);
sb.append("#endif\n\n");
}

sb.append(generateHiddenCopyConstructor(indent + " ", groupClassName));

final String codecStateParameter = null == fieldPrecedenceModel ?
")\n" :
",\n " + indent + " CodecState *codecState)\n";
",\n" + indent + " CodecState *codecState)\n";

final String codecStateAssignment = null == fieldPrecedenceModel ?
"" :
indent + " m_codecStatePtr = codecState;\n";
"#if defined(" + precedenceChecksFlagName + ")\n" +
indent + " m_codecStatePtr = codecState;\n" +
"#endif\n";

new Formatter(sb).format(
indent + "public:\n" +
Expand Down Expand Up @@ -802,7 +822,9 @@ private void generateGroupClassHeader(
{
final String codecStateNullAssignment = null == fieldPrecedenceModel ?
"" :
indent + " m_codecStatePtr = nullptr;\n";
"#if defined(" + precedenceChecksFlagName + ")\n" +
indent + " m_codecStatePtr = nullptr;\n" +
"#endif\n";

new Formatter(sb).format(
indent + " inline void notPresent(std::uint64_t actingVersion)\n" +
Expand Down
Loading