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/core/util/port_server_client.cc | |
| parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
| parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) | |
Merge master
Diffstat (limited to 'test/core/util/port_server_client.cc')
| -rw-r--r-- | test/core/util/port_server_client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 8e61145a26..7efa951862 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -52,7 +52,7 @@ static void freed_port_from_server(void* arg, grpc_error* error) { pr->done = 1; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); } @@ -93,7 +93,7 @@ void grpc_free_port_using_server(int port) { grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (!pr.done) { - grpc_pollset_worker* worker = NULL; + grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work( @@ -150,7 +150,7 @@ static void got_port_from_server(void* arg, grpc_error* error) { pr->port = 0; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); return; } @@ -186,7 +186,7 @@ static void got_port_from_server(void* arg, grpc_error* error) { pr->port = port; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); } @@ -225,7 +225,7 @@ int grpc_pick_port_using_server(void) { grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (pr.port == -1) { - grpc_pollset_worker* worker = NULL; + grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work( |