diff options
author | Noah Eisen <ncteisen@google.com> | 2018-02-09 09:16:55 -0800 |
---|---|---|
committer | Noah Eisen <ncteisen@google.com> | 2018-02-09 09:16:55 -0800 |
commit | be82e64b3debcdb1d9ec6a149fc85af0d46bfb7e (patch) | |
tree | cc5e1234073eb250a2c319b5a4db2919fce060ea /test/core/transport | |
parent | 194436342137924b4fb7429bede037a4b5ec7edb (diff) |
Autofix c casts to c++ casts
Diffstat (limited to 'test/core/transport')
-rw-r--r-- | test/core/transport/chttp2/hpack_encoder_test.cc | 4 | ||||
-rw-r--r-- | test/core/transport/chttp2/settings_timeout_test.cc | 6 | ||||
-rw-r--r-- | test/core/transport/chttp2/stream_map_test.cc | 8 | ||||
-rw-r--r-- | test/core/transport/metadata_test.cc | 6 | ||||
-rw-r--r-- | test/core/transport/timeout_encoding_test.cc | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index a40bd643ec..d3ba50a91c 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -152,10 +152,10 @@ static void test_basic_headers() { } static void encode_int_to_str(int i, char* p) { - p[0] = (char)('a' + i % 26); + p[0] = static_cast<char>('a' + i % 26); i /= 26; GPR_ASSERT(i < 26); - p[1] = (char)('a' + i); + p[1] = static_cast<char>('a' + i); p[2] = 0; } diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 7fb395d4b6..39ae587bae 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -104,7 +104,7 @@ class Client { grpc_blocking_resolve_address(server_address_, "80", &server_addresses); ASSERT_EQ(GRPC_ERROR_NONE, error) << grpc_error_string(error); ASSERT_GE(server_addresses->naddrs, 1UL); - pollset_ = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + pollset_ = static_cast<grpc_pollset*>(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(pollset_, &mu_); grpc_pollset_set* pollset_set = grpc_pollset_set_create(); grpc_pollset_set_add_pollset(pollset_set, pollset_); @@ -177,7 +177,7 @@ class Client { private: static void OnEventDone(void* arg, grpc_error* error) { gpr_log(GPR_INFO, "OnEventDone(): %s", grpc_error_string(error)); - EventState* state = (EventState*)arg; + EventState* state = static_cast<EventState*>(arg); state->error_ = GRPC_ERROR_REF(error); gpr_atm_rel_store(&state->done_atm_, 1); } @@ -203,7 +203,7 @@ class Client { } static void PollsetDestroy(void* arg, grpc_error* error) { - grpc_pollset* pollset = (grpc_pollset*)arg; + grpc_pollset* pollset = static_cast<grpc_pollset*>(arg); grpc_pollset_destroy(pollset); gpr_free(pollset); } diff --git a/test/core/transport/chttp2/stream_map_test.cc b/test/core/transport/chttp2/stream_map_test.cc index 9b21cb2364..773eb3a35f 100644 --- a/test/core/transport/chttp2/stream_map_test.cc +++ b/test/core/transport/chttp2/stream_map_test.cc @@ -78,7 +78,7 @@ static void test_basic_add_find(uint32_t n) { grpc_chttp2_stream_map_init(&map, 8); GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void*)(uintptr_t)i); + grpc_chttp2_stream_map_add(&map, i, (void*)static_cast<uintptr_t>(i)); } GPR_ASSERT(n == grpc_chttp2_stream_map_size(&map)); GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(&map, 0)); @@ -133,7 +133,7 @@ static void test_delete_evens_sweep(uint32_t n) { grpc_chttp2_stream_map_init(&map, 8); for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void*)(uintptr_t)i); + grpc_chttp2_stream_map_add(&map, i, (void*)static_cast<uintptr_t>(i)); } for (i = 1; i <= n; i++) { if ((i & 1) == 0) { @@ -155,7 +155,7 @@ static void test_delete_evens_incremental(uint32_t n) { grpc_chttp2_stream_map_init(&map, 8); for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void*)(uintptr_t)i); + grpc_chttp2_stream_map_add(&map, i, (void*)static_cast<uintptr_t>(i)); if ((i & 1) == 0) { grpc_chttp2_stream_map_delete(&map, i); } @@ -177,7 +177,7 @@ static void test_periodic_compaction(uint32_t n) { grpc_chttp2_stream_map_init(&map, 16); GPR_ASSERT(map.capacity == 16); for (i = 1; i <= n; i++) { - grpc_chttp2_stream_map_add(&map, i, (void*)(uintptr_t)i); + grpc_chttp2_stream_map_add(&map, i, (void*)static_cast<uintptr_t>(i)); if (i > 8) { del = i - 8; GPR_ASSERT((void*)(uintptr_t)del == diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index 7d943fd5c7..84029dc87c 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -240,8 +240,8 @@ static void test_things_stick_around(void) { } for (i = 0; i < nstrs; i++) { - size_t p = (size_t)rand() % nstrs; - size_t q = (size_t)rand() % nstrs; + size_t p = static_cast<size_t>(rand()) % nstrs; + size_t q = static_cast<size_t>(rand()) % nstrs; size_t temp = shuf[p]; shuf[p] = shuf[q]; shuf[q] = temp; @@ -308,7 +308,7 @@ static void verify_binary_header_size(const char* key, const uint8_t* value, GPR_ASSERT(grpc_is_binary_header(GRPC_MDKEY(elem))); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem, false); grpc_slice value_slice = - grpc_slice_from_copied_buffer((const char*)value, value_len); + grpc_slice_from_copied_buffer(reinterpret_cast<const char*>(value), value_len); grpc_slice base64_encoded = grpc_chttp2_base64_encode(value_slice); size_t expected_size = 32 + strlen(key) + GRPC_SLICE_LENGTH(base64_encoded); GPR_ASSERT(expected_size == elem_size); diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc index 26e0785488..8e4e566a3e 100644 --- a/test/core/transport/timeout_encoding_test.cc +++ b/test/core/transport/timeout_encoding_test.cc @@ -103,20 +103,20 @@ void decode_suite(char ext, grpc_millis (*answer)(int64_t x)) { } static grpc_millis millis_from_nanos(int64_t x) { - return (grpc_millis)(x / GPR_NS_PER_MS + (x % GPR_NS_PER_MS != 0)); + return static_cast<grpc_millis>(x / GPR_NS_PER_MS + (x % GPR_NS_PER_MS != 0)); } static grpc_millis millis_from_micros(int64_t x) { - return (grpc_millis)(x / GPR_US_PER_MS + (x % GPR_US_PER_MS != 0)); + return static_cast<grpc_millis>(x / GPR_US_PER_MS + (x % GPR_US_PER_MS != 0)); } -static grpc_millis millis_from_millis(int64_t x) { return (grpc_millis)x; } +static grpc_millis millis_from_millis(int64_t x) { return static_cast<grpc_millis>(x); } static grpc_millis millis_from_seconds(int64_t x) { - return (grpc_millis)(x * GPR_MS_PER_SEC); + return static_cast<grpc_millis>(x * GPR_MS_PER_SEC); } static grpc_millis millis_from_minutes(int64_t x) { - return (grpc_millis)(x * 60 * GPR_MS_PER_SEC); + return static_cast<grpc_millis>(x * 60 * GPR_MS_PER_SEC); } static grpc_millis millis_from_hours(int64_t x) { - return (grpc_millis)(x * 3600 * GPR_MS_PER_SEC); + return static_cast<grpc_millis>(x * 3600 * GPR_MS_PER_SEC); } void test_decoding(void) { |