Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-05-27 16:54:56 +0300
committerRay Molenkamp <github@lazydodo.com>2019-05-27 16:54:56 +0300
commitb1f0e3e4a74a959779245c163dbe3258aab88085 (patch)
tree8dcc37dea107fcd562cd776a7dddee0f39daf0b4 /source/blender/blenloader
parenta096fbb32de8980323bfb690e909a76aace905ec (diff)
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
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 2 insertions, 2 deletions
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