diff options
| author |  Noah Eisen <ncteisen@google.com> | 2017-11-13 16:44:02 -0800 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2017-11-13 16:44:02 -0800 |
| commit | 68bb1bf7480e87005220003985da19ea0a0929d0 (patch) | |
| tree | c434576b07f94f427925dd7f7dfba4dbdeecee31 /test/cpp/grpclb/grpclb_api_test.cc | |
| parent | 6bf73e8cf6d9d2ede844ab628a0b88000ffc9afa (diff) | |
| parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into tracing++
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; } |