[Bf-blender-cvs] [b1d0432] master: Fix strict compiler flags with older GCC

Sergey Sharybin noreply at git.blender.org
Mon Aug 1 18:01:30 CEST 2016


Commit: b1d0432bb74ee39f31d44e2dec38e83c818ec44e
Author: Sergey Sharybin
Date:   Mon Aug 1 17:58:45 2016 +0200
Branches: master
https://developer.blender.org/rBb1d0432bb74ee39f31d44e2dec38e83c818ec44e

Fix strict compiler flags with older GCC

===================================================================

M	source/blender/blenlib/intern/BLI_heap.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c
index 0a8dafc..d7fd1ca 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -55,9 +55,10 @@ struct HeapNode_Chunk {
  * or we allocate past the reserved number.
  *
  * \note Optimize number for 64kb allocs.
+ * \note keep type in sync with tot_nodes in heap_node_alloc_chunk.
  */
 #define HEAP_CHUNK_DEFAULT_NUM \
-	((MEM_SIZE_OPTIMAL((1 << 16) - sizeof(struct HeapNode_Chunk))) / sizeof(HeapNode))
+	((unsigned int)((MEM_SIZE_OPTIMAL((1 << 16) - sizeof(struct HeapNode_Chunk))) / sizeof(HeapNode)))
 
 struct Heap {
 	unsigned int size;




More information about the Bf-blender-cvs mailing list