diff options
| author |  Mark D. Roth <roth@google.com> | 2017-11-15 12:54:28 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-11-15 12:54:28 -0800 |
| commit | 03610f672e725a050224bf40540fc085bead1656 (patch) | |
| tree | 360dc9d878d00458f8c65bc36197fb2719ba59d5 /test/core/end2end/fixtures/h2_sockpair+trace.cc | |
| parent | faeabfff5130a75f6f457384fcf6f6f1e092a611 (diff) | |
| parent | 366e23b604d6458787ef8df77a2fed9c6d861f45 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/core/end2end/fixtures/h2_sockpair+trace.cc')
| -rw-r--r-- | test/core/end2end/fixtures/h2_sockpair+trace.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index a1dea10225..f837841b21 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -53,7 +53,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast<grpc_endpoint_pair*>(f->fixture_data); grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, NULL, + grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); grpc_exec_ctx_finish(&exec_ctx); } @@ -80,10 +80,10 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( grpc_end2end_test_fixture f; memset(&f, 0, sizeof(f)); f.fixture_data = sfd; - f.cq = grpc_completion_queue_create_for_next(NULL); - f.shutdown_cq = grpc_completion_queue_create_for_pluck(NULL); + f.cq = grpc_completion_queue_create_for_next(nullptr); + f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); - *sfd = grpc_iomgr_create_endpoint_pair("fixture", NULL); + *sfd = grpc_iomgr_create_endpoint_pair("fixture", nullptr); return f; } @@ -110,8 +110,8 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_endpoint_pair* sfd = static_cast<grpc_endpoint_pair*>(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); - f->server = grpc_server_create(server_args, NULL); - grpc_server_register_completion_queue(f->server, f->cq, NULL); + f->server = grpc_server_create(server_args, nullptr); + grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); |