diff options
author | Craig Tiller <ctiller@google.com> | 2017-11-10 09:53:21 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-11-10 09:53:21 -0800 |
commit | 4782d92b2d4fab261b5520a29d79ba97fea9ce7b (patch) | |
tree | d060fc1c4093583abc9348cc69a64b52d065f6e3 /src/core/ext/filters/client_channel/subchannel_index.cc | |
parent | 1ef989cd50cdfb172e99c552a67e3ed5f350e5cc (diff) |
s/NULL/nullptr
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel_index.cc')
-rw-r--r-- | src/core/ext/filters/client_channel/subchannel_index.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index 0c4213cf77..ae39ca394e 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -53,7 +53,7 @@ static grpc_subchannel_key* create_key( memcpy((grpc_channel_filter*)k->args.filters, args->filters, sizeof(*k->args.filters) * k->args.filter_count); } else { - k->args.filters = NULL; + k->args.filters = nullptr; } k->args.args = copy_channel_args(args->args); return k; @@ -162,10 +162,10 @@ grpc_subchannel* grpc_subchannel_index_find(grpc_exec_ctx* exec_ctx, grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, grpc_subchannel_key* key, grpc_subchannel* constructed) { - grpc_subchannel* c = NULL; + grpc_subchannel* c = nullptr; bool need_to_unref_constructed; - while (c == NULL) { + while (c == nullptr) { need_to_unref_constructed = false; // Compare and swap loop: @@ -176,10 +176,10 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, // - Check to see if a subchannel already exists c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); - if (c != NULL) { + if (c != nullptr) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } - if (c != NULL) { + if (c != nullptr) { // yes -> we're done need_to_unref_constructed = true; } else { |