From 3728c02b87f2044b4bc63a113996fd7b1dd13e3b Mon Sep 17 00:00:00 2001 From: szdytom Date: Sun, 16 Jun 2024 21:36:50 +0800 Subject: [PATCH] fix for cl --- src/common/algorithm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/algorithm.c b/src/common/algorithm.c index 74013d20..e99c7e69 100644 --- a/src/common/algorithm.c +++ b/src/common/algorithm.c @@ -2,14 +2,14 @@ #include #include -static void merge(void* a_begin, - void* a_end, - void* b_begin, - void* b_end, - void* res, +static void merge(char* a_begin, + char* a_end, + char* b_begin, + char* b_end, + char* res, int elem_size, int (*cmp)(const void* a, const void* b)) { - void *a = a_begin, *b = b_begin, *r = res; + char *a = a_begin, *b = b_begin, *r = res; while(a < a_end && b < b_end) { if(cmp(a, b) <= 0) { memcpy(r, a, elem_size); @@ -28,15 +28,15 @@ static void merge(void* a_begin, memcpy(r, b, elem_size); } -void c11__stable_sort(void* ptr, +void c11__stable_sort(void* ptr_, int count, int elem_size, int (*cmp)(const void* a, const void* b)) { // merge sort - void* tmp = malloc(count * elem_size); + char* ptr = ptr_, *tmp = malloc(count * elem_size); for(int seg = 1; seg < count; seg *= 2) { - for(void* a = ptr; a < ptr + (count - seg) * elem_size; a += 2 * seg * elem_size) { - void* b = a + seg * elem_size, *a_end = b, *b_end = b + seg * elem_size; + for(char* a = ptr; a < ptr + (count - seg) * elem_size; a += 2 * seg * elem_size) { + char* b = a + seg * elem_size, *a_end = b, *b_end = b + seg * elem_size; if (b_end > ptr + count * elem_size) b_end = ptr + count * elem_size; merge(a, a_end, b, b_end, tmp, elem_size, cmp);