Commit ed00ac06 by Edward Thomson Committed by GitHub

Merge pull request #4314 from pks-t/pks/timsort

tsort: remove idempotent conditional assignment
parents 8f9d2bbf fdbb40fd
...@@ -310,7 +310,6 @@ static ssize_t collapse(void **dst, struct tsort_run *stack, ssize_t stack_curr, ...@@ -310,7 +310,6 @@ static ssize_t collapse(void **dst, struct tsort_run *stack, ssize_t stack_curr,
#define PUSH_NEXT() do {\ #define PUSH_NEXT() do {\
len = count_run(dst, curr, size, store);\ len = count_run(dst, curr, size, store);\
run = minrun;\ run = minrun;\
if (run < minrun) run = minrun;\
if (run > (ssize_t)size - curr) run = size - curr;\ if (run > (ssize_t)size - curr) run = size - curr;\
if (run > len) {\ if (run > len) {\
bisort(&dst[curr], len, run, cmp, payload);\ bisort(&dst[curr], len, run, cmp, payload);\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment