From b1f0e3e4a74a959779245c163dbe3258aab88085 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 27 May 2019 07:54:56 -0600 Subject: blenloader: Fix warnings with MSVC these macros are mostly used with size_t types, leading to msvc warning : warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits --- source/blender/blenloader/intern/readfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 36f3bcb1996..d08c9f23db1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -324,8 +324,8 @@ typedef struct OldNewMap { int capacity_exp; } OldNewMap; -#define ENTRIES_CAPACITY(onm) (1 << (onm)->capacity_exp) -#define MAP_CAPACITY(onm) (1 << ((onm)->capacity_exp + 1)) +#define ENTRIES_CAPACITY(onm) (1ll << (onm)->capacity_exp) +#define MAP_CAPACITY(onm) (1ll << ((onm)->capacity_exp + 1)) #define SLOT_MASK(onm) (MAP_CAPACITY(onm) - 1) #define DEFAULT_SIZE_EXP 6 #define PERTURB_SHIFT 5 -- cgit v1.2.3