sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

warning cleanup: correct some odd returns and quiet strict flag warnings on some systems.

Browse Source
This commit is contained in:
Campbell Barton 2013-09-02 17:59:04 +00:00
parent 15039b14ff
commit 1ea9f88ff9
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/tracking.c
View File

@ -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];

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

@ -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); }

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

@ -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);
}
/**

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

@ -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);
}
/**