diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2018-01-05 11:29:56 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2018-01-05 11:29:56 -0800 |
| commit | f40794953e361b2b5094fe825532498bee2f8ebd (patch) | |
| tree | 2df675e19bd02b999504544351ba30acf619806b /src/core/lib/iomgr/tcp_uv.cc | |
| parent | ce1be0c8b0fc55d3dd912152b5d116c7086d705a (diff) | |
Manual merge conflict resolve: remove exec_ctx param from tcp_free
Diffstat (limited to 'src/core/lib/iomgr/tcp_uv.cc')
| -rw-r--r-- | src/core/lib/iomgr/tcp_uv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index c227f5a515..baa49d5cc5 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -76,7 +76,7 @@ static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) { grpc_slice_from_copied_string(tcp->peer_string)); } -static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_free(grpc_tcp* tcp) { grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->handle); gpr_free(tcp->peer_string); |