diff options
| author |  Mark D. Roth <roth@google.com> | 2017-11-15 12:54:28 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-11-15 12:54:28 -0800 |
| commit | 03610f672e725a050224bf40540fc085bead1656 (patch) | |
| tree | 360dc9d878d00458f8c65bc36197fb2719ba59d5 /src/core/lib/security/transport/lb_targets_info.cc | |
| parent | faeabfff5130a75f6f457384fcf6f6f1e092a611 (diff) | |
| parent | 366e23b604d6458787ef8df77a2fed9c6d861f45 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'src/core/lib/security/transport/lb_targets_info.cc')
| -rw-r--r-- | src/core/lib/security/transport/lb_targets_info.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/security/transport/lb_targets_info.cc b/src/core/lib/security/transport/lb_targets_info.cc index 1655e18f37..c07be35840 100644 --- a/src/core/lib/security/transport/lb_targets_info.cc +++ b/src/core/lib/security/transport/lb_targets_info.cc @@ -49,9 +49,9 @@ grpc_slice_hash_table* grpc_lb_targets_info_find_in_args( const grpc_channel_args* args) { const grpc_arg* targets_info_arg = grpc_channel_args_find(args, GRPC_ARG_LB_SECURE_NAMING_MAP); - if (targets_info_arg != NULL) { + if (targets_info_arg != nullptr) { GPR_ASSERT(targets_info_arg->type == GRPC_ARG_POINTER); return (grpc_slice_hash_table*)targets_info_arg->value.pointer.p; } - return NULL; + return nullptr; } |