aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:45:28 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:45:28 -0700
commit1be70ccdb84ec41975cc018f6b2a2a89cf5072ee (patch)
treed4e6890ca32762bf786e2b801d3c26b27ec707ee /src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
parent45724b35e411fef7c5da66a74c78428c11d56843 (diff)
Move arguments to the start of lists
Diffstat (limited to 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.c')
-rw-r--r--src/core/client_config/subchannel_factory_decorators/merge_channel_args.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
index 993b95296b..59af175da1 100644
--- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
+++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
@@ -51,7 +51,7 @@ merge_args_factory_ref (grpc_subchannel_factory * scf)
}
static void
-merge_args_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * closure_list)
+merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf)
{
merge_args_factory *f = (merge_args_factory *) scf;
if (gpr_unref (&f->refs))
@@ -63,7 +63,7 @@ merge_args_factory_unref (grpc_subchannel_factory * scf, grpc_closure_list * clo
}
static grpc_subchannel *
-merge_args_factory_create_subchannel (grpc_subchannel_factory * scf, grpc_subchannel_args * args, grpc_closure_list * closure_list)
+merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * scf, grpc_subchannel_args * args)
{
merge_args_factory *f = (merge_args_factory *) scf;
grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args);