marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix timsort so that it compiles with Visual Studio

Armin Burgmeier 2012-02-01 23:03:29 +01:00
parent a2fb35c985
commit fc598e79dc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
thirdparty/timsort/sort.h vendored
View File

@ -1,7 +1,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#ifndef _MSC_VER
# include <stdint.h>
#endif
#ifndef SORT_NAME
#error "Must declare SORT_NAME"
@ -41,7 +43,7 @@ int clzll(uint64_t x) {
#endif
#define SORT_SWAP(x,y) ({SORT_TYPE __SORT_SWAP_t = (x); (x) = (y); (y) = __SORT_SWAP_t;})
#define SORT_SWAP(x,y) {SORT_TYPE __SORT_SWAP_t = (x); (x) = (y); (y) = __SORT_SWAP_t;}
#define SORT_CONCAT(x, y) x ## _ ## y
#define SORT_MAKE_STR1(x, y) SORT_CONCAT(x,y)
@ -220,8 +222,12 @@ void MERGE_SORT(SORT_TYPE *dst, const size_t size)
MERGE_SORT(dst, middle);
MERGE_SORT(&dst[middle], size - middle);
#ifdef _MSC_VER
SORT_TYPE* newdst = (SORT_TYPE*)malloc(size * sizeof(SORT_TYPE));
#else
SORT_TYPE newdst[size];
#endif
int64_t out = 0;
int64_t i = 0;
int64_t j = middle;
@ -244,6 +250,10 @@ void MERGE_SORT(SORT_TYPE *dst, const size_t size)
out++;
}
memcpy(dst, newdst, size * sizeof(SORT_TYPE));
#ifdef _MSC_VER
free(newdst);
#endif
}
@ -358,7 +368,8 @@ if (run > len)\
binary_insertion_sort_start(&dst[curr], len, run);\
len = run;\
}\
run_stack[stack_curr++] = (TIM_SORT_RUN_T) {curr, len};\
run_stack[stack_curr].start = curr;\
run_stack[stack_curr++].length = len;\
curr += len;\
if (curr == size)\
{\