diff --git a/ConflictSet.cpp b/ConflictSet.cpp index d55b38c..877cfd4 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -3365,10 +3365,8 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job, job->commonPrefixNode = job->n; if (job->lcp == int(job->begin.size())) { - *job->result = checkRangeRightSide(job->n, job->end, job->lcp, - job->readVersion, context->tls) - ? ConflictSet::Commit - : ConflictSet::Conflict; + job->setResult(checkRangeRightSide(job->n, job->end, job->lcp, + job->readVersion, context->tls)); MUSTTAIL return complete(job, context); } @@ -3378,7 +3376,7 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job, if (!checkRangeStartsWith(job->n, job->begin.subspan(0, job->lcp), job->begin[job->lcp], job->end[job->lcp], job->readVersion, context->tls)) { - *job->result = ConflictSet::Conflict; + job->setResult(false); MUSTTAIL return complete(job, context); } @@ -3479,7 +3477,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) { if (job->remaining.size() == 0) { assert(job->searchPathLen >= job->prefixLen); if (maxVersion(n) > job->readVersion) { - *job->result = ConflictSet::Conflict; + job->setResult(false); MUSTTAIL return complete(job, context); } else { job->continuation = done_left_side_iter; @@ -3490,7 +3488,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) { if (job->searchPathLen >= job->prefixLen) { if (!checkMaxBetweenExclusive(n, job->remaining[0], 256, job->readVersion, context->tls)) { - *job->result = ConflictSet::Conflict; + job->setResult(false); MUSTTAIL return complete(job, context); } } @@ -3508,7 +3506,7 @@ PRESERVE_NONE void left_side_iter(CheckJob *job, CheckContext *context) { } job->n = c; if (maxVersion(job->n) > job->readVersion) { - *job->result = ConflictSet::Conflict; + job->setResult(false); MUSTTAIL return complete(job, context); } job->continuation = done_left_side_iter;