diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
| commit | 177039b2f89e73ad0d048da021f939f3a153c4e2 (patch) | |
| tree | c7f10f04cd9a0872863e2b181162bc9928160cd8 /test/cpp/performance | |
| parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
| parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) | |
Merge master
Diffstat (limited to 'test/cpp/performance')
| -rw-r--r-- | test/cpp/performance/writes_per_rpc_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index ae658ff87c..c5d29469b2 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -99,9 +99,9 @@ class EndpointPairFixture { grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(server_->c_server(), transport, NULL, + grpc_server_setup_transport(server_->c_server(), transport, nullptr, server_args); - grpc_chttp2_transport_start_reading(transport, NULL); + grpc_chttp2_transport_start_reading(transport, nullptr); } /* create channel */ @@ -116,7 +116,7 @@ class EndpointPairFixture { GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_chttp2_transport_start_reading(transport, NULL); + grpc_chttp2_transport_start_reading(transport, nullptr); channel_ = CreateChannelInternal("", channel); } |