From 6bdee53e70488064d98ccbd2840068b85fcb5593 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Wed, 21 Dec 2011 17:58:57 +0000 Subject: [PATCH] Removed a few explicit casts which caused warnings. (From louisdx) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3707 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/libs/heap/heap.c | 2 +- sc2/src/libs/uio/hashtable.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc2/src/libs/heap/heap.c b/sc2/src/libs/heap/heap.c index 515fc37a3..1f4c0f71b 100644 --- a/sc2/src/libs/heap/heap.c +++ b/sc2/src/libs/heap/heap.c @@ -49,7 +49,7 @@ Heap_new(HeapValue_Comparator comparator, size_t initialSize, size_t minSize, heap->minSize = minSize; heap->minFillQuotient = minFillQuotient; heap->size = nextPower2(initialSize); - heap->minFill = (size_t) ceil(((double) (heap->size >> 1)) + heap->minFill = ceil(((double) (heap->size >> 1)) * heap->minFillQuotient); heap->entries = malloc(heap->size * sizeof (HeapValue *)); heap->numEntries = 0; diff --git a/sc2/src/libs/uio/hashtable.c b/sc2/src/libs/uio/hashtable.c index 4e8907e48..1f376e154 100644 --- a/sc2/src/libs/uio/hashtable.c +++ b/sc2/src/libs/uio/hashtable.c @@ -169,12 +169,12 @@ static void HASHTABLE_(setup)(HASHTABLE_(HashTable) *hashTable, uio_uint32 initialSize) { if (initialSize < 4) initialSize = 4; - hashTable->size = nextPower2((uio_uint32) ceil( - ((double) initialSize) / hashTable->maxFillQuotient)); + hashTable->size = nextPower2(ceil(((double) initialSize) / + hashTable->maxFillQuotient)); hashTable->hashMask = hashTable->size - 1; - hashTable->minSize = (uio_uint32) ceil(((double) (hashTable->size >> 1)) + hashTable->minSize = ceil(((double) (hashTable->size >> 1)) * hashTable->minFillQuotient); - hashTable->maxSize = (uio_uint32) floor(((double) hashTable->size) + hashTable->maxSize = floor(((double) hashTable->size) * hashTable->maxFillQuotient); hashTable->entries = uio_calloc(hashTable->size, sizeof (HASHTABLE_(HashEntry) *));