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/mock_endpoint.cc | |
parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) |
Merge master
Diffstat (limited to 'test/core/util/mock_endpoint.cc')
-rw-r--r-- | test/core/util/mock_endpoint.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index fd9e82c30b..4b35a581b1 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -78,7 +78,7 @@ static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Endpoint Shutdown", &why, 1)); - m->on_read = NULL; + m->on_read = nullptr; } gpr_mu_unlock(&m->mu); grpc_resource_user_shutdown(m->resource_user); @@ -127,17 +127,17 @@ grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_slice_buffer_init(&m->read_buffer); gpr_mu_init(&m->mu); m->on_write = on_write; - m->on_read = NULL; + m->on_read = nullptr; return &m->base; } void grpc_mock_endpoint_put_read(grpc_endpoint* ep, grpc_slice slice) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); - if (m->on_read != NULL) { + if (m->on_read != nullptr) { grpc_slice_buffer_add(m->on_read_out, slice); GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); - m->on_read = NULL; + m->on_read = nullptr; } else { grpc_slice_buffer_add(&m->read_buffer, slice); } |