diff options
author | 2017-12-06 22:09:36 -0800 | |
---|---|---|
committer | 2017-12-06 22:09:36 -0800 | |
commit | 67454d71e833a7704d61e673ad32e71dd31c868a (patch) | |
tree | fe720c5bb8388a02ed334b0b0c071c0f7b895b31 /src/core/ext/transport/chttp2/server/insecure | |
parent | fc38142db69cd8c95f3c55a296b4e73b04c720c3 (diff) | |
parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) |
Merge commit 'b0bad8f' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/ext/transport/chttp2/server/insecure')
-rw-r--r-- | src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index e37d69e5e9..007d1be50c 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -36,7 +36,7 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd) { - GPR_ASSERT(reserved == NULL); + GPR_ASSERT(reserved == nullptr); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char* name; @@ -60,8 +60,9 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, grpc_endpoint_add_to_pollset(&exec_ctx, server_endpoint, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server, transport, NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, + server_args); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr); grpc_exec_ctx_finish(&exec_ctx); } |