[Bf-blender-cvs] [6febbd7a558] temp_bmesh_multires: Linux's gcc's flags are evil

Joseph Eagar noreply at git.blender.org
Thu Sep 2 20:42:21 CEST 2021


Commit: 6febbd7a55850219e0e5af8044126abcbee02ccc
Author: Joseph Eagar
Date:   Thu Sep 2 11:42:06 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB6febbd7a55850219e0e5af8044126abcbee02ccc

Linux's gcc's flags are evil

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

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

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

diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index a8e7a1e0ec2..67a9327f343 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -247,10 +247,10 @@ static BLI_freenode *mempool_chunk_add(BLI_mempool *pool,
         MEM_allocN_len(pool->chunktable) / sizeof(void *) <= (size_t)pool->totchunk) {
       void *old = pool->chunktable;
 
-      size_t size = (size_t)pool->totchunk + 2ULL;
-      size += size >> 1ULL;
+      int size = (int)pool->totchunk + 2;
+      size += size >> 1;
 
-      pool->chunktable = MEM_mallocN(sizeof(void *) * size, "mempool chunktable");
+      pool->chunktable = MEM_mallocN(sizeof(void *) * (size_t)size, "mempool chunktable");
 
       if (old) {
         memcpy(pool->chunktable, old, sizeof(void *) * (size_t)pool->totchunk);
@@ -630,7 +630,7 @@ int BLI_mempool_get_size(BLI_mempool *pool)
   while (chunk) {
     chunk = chunk->next;
 
-    ret += pool->pchunk;
+    ret += (int)pool->pchunk;
   }
 
   return ret;



More information about the Bf-blender-cvs mailing list