diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-02 21:59:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-02 21:59:04 +0400 |
commit | 1ea9f88ff9ef57746a60306022448ad215007ba6 (patch) | |
tree | 3d3aca72fc2388a14a8a12bfe10be28a3026b059 | |
parent | 15039b14fffd783f4f9da86b6de8596f7d904baa (diff) |
warning cleanup: correct some odd returns and quiet strict flag warnings on some systems.
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 1 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_edgehash.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_mempool.c | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 73876c532e7..093b60536ee 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -2417,7 +2417,6 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking) * of currently operating tracks (if needed) */ for (a = 0; a < map->num_tracks; a++) { - int replace_sel = 0, replace_rot = 0; MovieTrackingTrack *new_track, *old_track; track = &map->tracks[a]; diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index 510d881f26d..2ca011871d8 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -89,7 +89,7 @@ void BLI_edgeset_free(EdgeSet *es); /* rely on inline api for now */ BLI_INLINE EdgeSetIterator *BLI_edgesetIterator_new(EdgeSet *gs) { return (EdgeSetIterator *)BLI_edgehashIterator_new((EdgeHash *)gs); } BLI_INLINE void BLI_edgesetIterator_free(EdgeSetIterator *esi) { BLI_edgehashIterator_free((EdgeHashIterator *)esi); } -BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *v0_r, unsigned int *v1_r) { return BLI_edgehashIterator_getKey((EdgeHashIterator *)esi, v0_r, v1_r); } +BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *v0_r, unsigned int *v1_r) { BLI_edgehashIterator_getKey((EdgeHashIterator *)esi, v0_r, v1_r); } BLI_INLINE void BLI_edgesetIterator_step(EdgeSetIterator *esi) { BLI_edgehashIterator_step((EdgeHashIterator *)esi); } BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) { return BLI_edgehashIterator_isDone((EdgeHashIterator *)esi); } diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 7b50e9012a8..fcca6cd59ba 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -238,7 +238,7 @@ BLI_INLINE void ghash_insert_ex_keyonly(GHash *gh, void *key, BLI_INLINE void ghash_insert(GHash *gh, void *key, void *val) { const unsigned int hash = ghash_keyhash(gh, key); - return ghash_insert_ex(gh, key, val, hash); + ghash_insert_ex(gh, key, val, hash); } /** diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index 0aeb0896893..feeda151b5b 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -407,7 +407,7 @@ void BLI_mempool_as_table(BLI_mempool *pool, void **data) while ((elem = BLI_mempool_iterstep(&iter))) { *p++ = elem; } - BLI_assert((p - data) == pool->totused); + BLI_assert((unsigned int)(p - data) == pool->totused); } /** @@ -433,7 +433,7 @@ void BLI_mempool_as_array(BLI_mempool *pool, void *data) memcpy(p, elem, (size_t)pool->esize); p += pool->esize; } - BLI_assert((p - (char *)data) == pool->totused * pool->esize); + BLI_assert((unsigned int)(p - (char *)data) == pool->totused * pool->esize); } /** @@ -570,7 +570,7 @@ void BLI_mempool_clear_ex(BLI_mempool *pool, const int totelem_reserve) */ void BLI_mempool_clear(BLI_mempool *pool) { - return BLI_mempool_clear_ex(pool, -1); + BLI_mempool_clear_ex(pool, -1); } /** |