diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
| commit | 9898212a4181fee4d9967cfbf42576b4a7f7e529 (patch) | |
| tree | da311844d93891c031b279024c0b0f3d7fe0889a /test/cpp/grpclb/grpclb_api_test.cc | |
| parent | 739ff08a7f4686306ef8d5b72c2a89b12305e275 (diff) | |
| parent | fbe8ff657ccb742daedae11a1029f5628de07ce7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-objc-void-func
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 6b0350e1f9..7b62080b49 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; } |