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/cpp/grpclb/grpclb_api_test.cc | |
| parent | 8c5c654fa32c3f139babb6a5180c01028e19b631 (diff) | |
| parent | 95e23594b026eca21151f31b039bd2a51ea67109 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into removed_expiration_interval
Diffstat (limited to 'test/cpp/grpclb/grpclb_api_test.cc')
| -rw-r--r-- | test/cpp/grpclb/grpclb_api_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 54b5708e6a..03778e1fc5 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -48,7 +48,7 @@ grpc::string PackedStringToIp(const grpc_grpclb_ip_address& pb_ip) { } else { abort(); } - GPR_ASSERT(inet_ntop(af, (void*)pb_ip.bytes, ip_str, 46) != NULL); + GPR_ASSERT(inet_ntop(af, (void*)pb_ip.bytes, ip_str, 46) != nullptr); return ip_str; } |