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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-06 19:19:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-06 19:21:55 +0300
commit2dba2b3d71d9781bce452c78a4f2c686169418b4 (patch)
tree34d33cffc5fb045f21ed2fec3d2fd74b1279210f /tests/gtests/blenlib/BLI_ghash_performance_test.cc
parent5508cc2d6319729d624b969a24c0a64286f34993 (diff)
Fix gtests on Windows/MSVC
There were some missing stubs and some tests were specifically written for Linux. Also, apparently MSVC has a limit of 64K for the insource strings..
Diffstat (limited to 'tests/gtests/blenlib/BLI_ghash_performance_test.cc')
-rw-r--r--tests/gtests/blenlib/BLI_ghash_performance_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
index fcee72466b7..972d1f6909c 100644
--- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
@@ -339,7 +339,8 @@ static void int4_ghash_tests(GHash *ghash, const char *id, const unsigned int nb
{
printf("\n========== STARTING %s ==========\n", id);
- unsigned int (*data)[4] = (unsigned int (*)[4])MEM_mallocN(sizeof(*data) * (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;