diff options
author | Craig Tiller <ctiller@google.com> | 2017-09-11 12:09:03 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-09-11 12:09:03 -0700 |
commit | 4aac9a664a56b313bab725b7a6bf5da571e0c747 (patch) | |
tree | 615c37fa234acb13a02cea1f826bebc1fef21c32 /test/core/security | |
parent | 4f5acf73c9c2246eb03e66c880eb44f37d91b9cd (diff) | |
parent | 55c4b31389d5557b88d39bde6d783d68aa747de7 (diff) |
Merge github.com:grpc/grpc into pollset_kick_stats
Diffstat (limited to 'test/core/security')
-rw-r--r-- | test/core/security/secure_endpoint_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index e9f2c76738..839a05fa9b 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -70,7 +70,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t still_pending_size; size_t total_buffer_size = 8192; size_t buffer_size = total_buffer_size; - uint8_t *encrypted_buffer = gpr_malloc(buffer_size); + uint8_t *encrypted_buffer = (uint8_t *)gpr_malloc(buffer_size); uint8_t *cur = encrypted_buffer; grpc_slice encrypted_leftover; for (i = 0; i < leftover_nslices; i++) { @@ -202,7 +202,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); + grpc_pollset_destroy(exec_ctx, (grpc_pollset *)p); } int main(int argc, char **argv) { @@ -211,7 +211,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - g_pollset = gpr_zalloc(grpc_pollset_size()); + g_pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); grpc_endpoint_tests(configs[0], g_pollset, g_mu); grpc_endpoint_tests(configs[1], g_pollset, g_mu); |