From bf1e02872d20aa10f5ca6b3cd344b6a765f0afe2 Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Sat, 7 Feb 2015 17:35:11 +0100 Subject: [PATCH] Revert "Avoid signed/unsigned comparison in mesh sorting." This reverts commit 01b47bae8e3bb35d9852290ebceb791f1d495e4b. --- thirdparty/timsort/sort.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thirdparty/timsort/sort.h b/thirdparty/timsort/sort.h index 3805f3368..e54ad497d 100644 --- a/thirdparty/timsort/sort.h +++ b/thirdparty/timsort/sort.h @@ -80,7 +80,7 @@ void HEAP_SORT(SORT_TYPE *dst, const size_t size); void QUICK_SORT(SORT_TYPE *dst, const size_t size); void MERGE_SORT(SORT_TYPE *dst, const size_t size); void BUBBLE_SORT(SORT_TYPE *dst, const size_t size); -void TIM_SORT(SORT_TYPE *dst, const int64_t size); +void TIM_SORT(SORT_TYPE *dst, const size_t size); /* From http://oeis.org/classic/A102549 */ @@ -546,7 +546,7 @@ static inline int tim_sort_collapse(SORT_TYPE *dst, TIM_SORT_RUN_T *stack, int s return stack_curr; } -void TIM_SORT(SORT_TYPE *dst, const int64_t size) +void TIM_SORT(SORT_TYPE *dst, const size_t size) { if (size < 64) {