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/cpp/performance | |
| parent | faeabfff5130a75f6f457384fcf6f6f1e092a611 (diff) | |
| parent | 366e23b604d6458787ef8df77a2fed9c6d861f45 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/cpp/performance')
| -rw-r--r-- | test/cpp/performance/writes_per_rpc_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 1d8b30f0ad..1c6f44dd7d 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -100,7 +100,7 @@ class EndpointPairFixture { } grpc_server_setup_transport(&exec_ctx, server_->c_server(), transport, - NULL, server_args); + nullptr, server_args); grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); } |