archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

reduce sign comparisons for ghash and add more strict warnings for gcc.

Browse Source
This commit is contained in:
Campbell Barton
2013-06-20 19:39:29 +00:00
parent 6a269e2a8e
commit 2efea8cf03
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_ghash.h
View File

@@ -60,7 +60,7 @@ typedef struct GHash {
typedef struct GHashIterator { typedef struct GHashIterator {
GHash *gh; GHash *gh;
int curBucket; unsigned int curBucket;
struct Entry *curEntry; struct Entry *curEntry;
} GHashIterator; } GHashIterator;

10
source/blender/blenlib/intern/BLI_ghash.c
View File

@@ -44,6 +44,8 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic error "-Wsign-conversion" # pragma GCC diagnostic error "-Wsign-conversion"
# pragma GCC diagnostic error "-Wsign-compare"
# pragma GCC diagnostic error "-Wconversion"
#endif #endif
const unsigned int hashsizes[] = { const unsigned int hashsizes[] = {
@@ -152,7 +154,7 @@ bool BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFr
void BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp) void BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp)
{ {
int i; unsigned int i;
if (keyfreefp || valfreefp) { if (keyfreefp || valfreefp) {
for (i = 0; i < gh->nbuckets; i++) { for (i = 0; i < gh->nbuckets; i++) {
@@ -220,7 +222,7 @@ bool BLI_ghash_haskey(GHash *gh, const void *key)
void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp) void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp)
{ {
int i; unsigned int i;
if (keyfreefp || valfreefp) { if (keyfreefp || valfreefp) {
for (i = 0; i < gh->nbuckets; i++) { for (i = 0; i < gh->nbuckets; i++) {
@@ -252,7 +254,7 @@ GHashIterator *BLI_ghashIterator_new(GHash *gh)
GHashIterator *ghi = MEM_mallocN(sizeof(*ghi), "ghash iterator"); GHashIterator *ghi = MEM_mallocN(sizeof(*ghi), "ghash iterator");
ghi->gh = gh; ghi->gh = gh;
ghi->curEntry = NULL; ghi->curEntry = NULL;
ghi->curBucket = -1; ghi->curBucket = (unsigned int)-1;
while (!ghi->curEntry) { while (!ghi->curEntry) {
ghi->curBucket++; ghi->curBucket++;
if (ghi->curBucket == ghi->gh->nbuckets) if (ghi->curBucket == ghi->gh->nbuckets)
@@ -265,7 +267,7 @@ void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh)
{ {
ghi->gh = gh; ghi->gh = gh;
ghi->curEntry = NULL; ghi->curEntry = NULL;
ghi->curBucket = -1; ghi->curBucket = (unsigned int)-1;
while (!ghi->curEntry) { while (!ghi->curEntry) {
ghi->curBucket++; ghi->curBucket++;
if (ghi->curBucket == ghi->gh->nbuckets) if (ghi->curBucket == ghi->gh->nbuckets)

2
source/blender/blenlib/intern/BLI_heap.c
View File

@@ -41,6 +41,8 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic error "-Wsign-conversion" # pragma GCC diagnostic error "-Wsign-conversion"
# pragma GCC diagnostic error "-Wsign-compare"
# pragma GCC diagnostic error "-Wconversion"
#endif #endif
/***/ /***/

6
source/blender/blenlib/intern/BLI_mempool.c
View File

@@ -45,6 +45,8 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic error "-Wsign-conversion" # pragma GCC diagnostic error "-Wsign-conversion"
# pragma GCC diagnostic error "-Wsign-compare"
# pragma GCC diagnostic error "-Wconversion"
#endif #endif
/* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */ /* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */
@@ -102,8 +104,8 @@ BLI_mempool *BLI_mempool_create(int esize, int totelem, int pchunk, int flag)
} }
/* set the elem size */ /* set the elem size */
if (esize < MEMPOOL_ELEM_SIZE_MIN) { if (esize < (int)MEMPOOL_ELEM_SIZE_MIN) {
esize = MEMPOOL_ELEM_SIZE_MIN; esize = (int)MEMPOOL_ELEM_SIZE_MIN;
} }
if (flag & BLI_MEMPOOL_ALLOW_ITER) { if (flag & BLI_MEMPOOL_ALLOW_ITER) {