diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
| commit | d1966582797e0547de0f81e032b4bc5617030c79 (patch) | |
| tree | d60ed7e87bbfb7d0aaa2cee7687e85155e17bf31 /test/core/iomgr/fd_conservation_posix_test.cc | |
| parent | 8c5c654fa32c3f139babb6a5180c01028e19b631 (diff) | |
| parent | 95e23594b026eca21151f31b039bd2a51ea67109 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into removed_expiration_interval
Diffstat (limited to 'test/core/iomgr/fd_conservation_posix_test.cc')
| -rw-r--r-- | test/core/iomgr/fd_conservation_posix_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index b76c247fb8..f46430c611 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -42,7 +42,7 @@ int main(int argc, char** argv) { grpc_resource_quota_create("fd_conservation_posix_test"); for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", NULL); + p = grpc_iomgr_create_endpoint_pair("test", nullptr); grpc_endpoint_destroy(&exec_ctx, p.client); grpc_endpoint_destroy(&exec_ctx, p.server); grpc_exec_ctx_flush(&exec_ctx); |