diff options
author | 2016-01-11 10:08:26 -0800 | |
---|---|---|
committer | 2016-01-11 10:08:26 -0800 | |
commit | 6045681003bef90de4d58952474893cfb56741e4 (patch) | |
tree | ff0e1b5150c7a27d88ea7eab82acc6d95bc30c0a /src/core/channel/channel_stack.c | |
parent | 78268212bae4e745606108beeeff317af393e033 (diff) | |
parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) |
Merge branch 'master' into bbuf
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; |