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/microbenchmarks/bm_chttp2_transport.cc | |
parent | faeabfff5130a75f6f457384fcf6f6f1e092a611 (diff) | |
parent | 366e23b604d6458787ef8df77a2fed9c6d861f45 (diff) |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/cpp/microbenchmarks/bm_chttp2_transport.cc')
-rw-r--r-- | test/cpp/microbenchmarks/bm_chttp2_transport.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index d5d423c8e8..be4da4d0bd 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -100,7 +100,7 @@ class DummyEndpoint : public grpc_endpoint { GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); } - static grpc_workqueue* get_workqueue(grpc_endpoint* ep) { return NULL; } + static grpc_workqueue* get_workqueue(grpc_endpoint* ep) { return nullptr; } static void add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset* pollset) {} @@ -222,7 +222,7 @@ class Stream { } grpc_transport_init_stream(f_->exec_ctx(), f_->transport(), static_cast<grpc_stream*>(stream_), &refcount_, - NULL, arena_); + nullptr, arena_); } void DestroyThen(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { @@ -586,7 +586,7 @@ static void BM_TransportStreamRecv(benchmark::State& state) { }); drain_start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (recv_stream == NULL) { + if (recv_stream == nullptr) { GPR_ASSERT(!state.KeepRunning()); return; } |