[Bf-blender-cvs] [2f7237a] master: Fix broken ghash performance gtest.
Bastien Montagne
noreply at git.blender.org
Tue Feb 16 22:22:51 CET 2016
Commit: 2f7237ac78bb70342bb1db16b4ee725d0c5dedfa
Author: Bastien Montagne
Date: Tue Feb 16 22:18:49 2016 +0100
Branches: master
https://developer.blender.org/rB2f7237ac78bb70342bb1db16b4ee725d0c5dedfa
Fix broken ghash performance gtest.
Regression from rB2dba2b3d71d9781bce45. Do not understand why MSVC needs this convoluted
allocation (looks like broken compiler crap?), but at least let's do it correctly!
===================================================================
M tests/gtests/blenlib/BLI_ghash_performance_test.cc
===================================================================
diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
index 972d1f6..817f0b3 100644
--- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
@@ -339,7 +339,7 @@ static void int4_ghash_tests(GHash *ghash, const char *id, const unsigned int nb
{
printf("\n========== STARTING %s ==========\n", id);
- void *data_v = MEM_mallocN(sizeof(unsigned int (*)[4]) * (size_t)nbr, __func__);
+ void *data_v = MEM_mallocN(sizeof(unsigned int[4]) * (size_t)nbr, __func__);
unsigned int (*data)[4] = (unsigned int (*)[4])data_v;
unsigned int (*dt)[4];
unsigned int i, j;
More information about the Bf-blender-cvs
mailing list