aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/naming
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-09-19 12:44:15 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-09-19 12:44:15 -0700
commit6a34067d16d909729aa0860c3dedf8d5af0a6d28 (patch)
treeb4588798eab8eef2dde601062cd856173c752b75 /test/cpp/naming
parentdd96654721673d42132a5637b4b88fd1a04b29b1 (diff)
parenta262f8fa79fd86238343c18911bbe3c5e1f767cd (diff)
Merge github.com:grpc/grpc into grpc_millis
Diffstat (limited to 'test/cpp/naming')
-rw-r--r--test/cpp/naming/resolver_component_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index 34575e0fe5..0851fd6137 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -270,7 +270,8 @@ void CheckResolverResultLocked(grpc_exec_ctx *exec_ctx, void *argsp,
CheckLBPolicyResultLocked(channel_args, args);
gpr_atm_rel_store(&args->done_atm, 1);
gpr_mu_lock(args->mu);
- GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL));
+ GRPC_LOG_IF_ERROR("pollset_kick",
+ grpc_pollset_kick(exec_ctx, args->pollset, NULL));
gpr_mu_unlock(args->mu);
}