diff options
author | 2016-01-08 12:33:22 -0800 | |
---|---|---|
committer | 2016-01-08 12:33:22 -0800 | |
commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
tree | ab7baa05c08aeac191768fadc766866434beb36b /src/core/channel/channel_stack.c | |
parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) |
Merged from master and resolved merge conflicts
Diffstat (limited to 'src/core/channel/channel_stack.c')
-rw-r--r-- | src/core/channel/channel_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 5e09a050ee..3e61688364 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -137,7 +137,7 @@ void grpc_channel_stack_init(grpc_exec_ctx *exec_ctx, int initial_refs, } GPR_ASSERT(user_data > (char *)stack); - GPR_ASSERT((gpr_uintptr)(user_data - (char *)stack) == + GPR_ASSERT((uintptr_t)(user_data - (char *)stack) == grpc_channel_stack_size(filters, filter_count)); stack->call_stack_size = call_size; |