diff options
author | 2016-04-29 11:01:37 -0700 | |
---|---|---|
committer | 2016-04-29 11:01:37 -0700 | |
commit | a2b549578f94de1bf4735a26c9fc4516b96bbdaa (patch) | |
tree | 84ff7eee31a528b46348ef135981434d670bbc48 /src/core/lib/surface/server.c | |
parent | 192afb9a31d52d9a3bcd0984915377d331e04859 (diff) | |
parent | 514699c63b5470d90395b4511982d3dc3700cad3 (diff) |
Merge branch 'master' into server_channel_affinity
Diffstat (limited to 'src/core/lib/surface/server.c')
-rw-r--r-- | src/core/lib/surface/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c index 0a84d8e7cd..c9b458faf2 100644 --- a/src/core/lib/surface/server.c +++ b/src/core/lib/surface/server.c @@ -820,8 +820,8 @@ static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, server_ref(chand->server); } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + void *ignored) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; |