aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2015-12-17 10:37:10 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2015-12-17 18:54:58 -0800
commit1b34aeb554a5c825fb5839139186a679589526f4 (patch)
tree09dd06ffae56494926e4d369087dc80d98e84dde /test
parent0cde8d45093ec07ac80cecbfa37b096312acbc1d (diff)
fixing x64 build with vs2015
Diffstat (limited to 'test')
-rw-r--r--test/core/support/alloc_test.c4
-rw-r--r--test/core/transport/connectivity_state_test.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/core/support/alloc_test.c b/test/core/support/alloc_test.c
index b950f0ab49..dc0a2acfa5 100644
--- a/test/core/support/alloc_test.c
+++ b/test/core/support/alloc_test.c
@@ -48,8 +48,8 @@ static void test_custom_allocs() {
gpr_allocation_functions fns = {fake_malloc, fake_realloc, fake_free};
gpr_set_allocation_functions(fns);
- GPR_ASSERT((void *)0xdeadbeef == gpr_malloc(0xdeadbeef));
- GPR_ASSERT((void *)0xcafed00d == gpr_realloc(0, 0xcafed00d));
+ GPR_ASSERT((void*)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef));
+ GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(0, 0xcafed00d));
gpr_free(&addr_to_free);
GPR_ASSERT(addr_to_free == 0xdeadd00d);
diff --git a/test/core/transport/connectivity_state_test.c b/test/core/transport/connectivity_state_test.c
index 1f23221812..34ab45d260 100644
--- a/test/core/transport/connectivity_state_test.c
+++ b/test/core/transport/connectivity_state_test.c
@@ -39,7 +39,7 @@
#include "test/core/util/test_config.h"
-#define THE_ARG ((void *)0xcafebabe)
+#define THE_ARG ((void *)(size_t)0xcafebabe)
int g_counter;