diff options
author | 2015-09-21 08:21:57 -0700 | |
---|---|---|
committer | 2015-09-21 08:21:57 -0700 | |
commit | 3ffd8220a17fd2fdf64adc66b03e4e254880471b (patch) | |
tree | 3ca08d9bd0e06d9159e0c145313b3862aef0d877 /src/core/client_config/subchannel_factory_decorators/merge_channel_args.c | |
parent | d1bec03fa148344b8eac2b59517252d86e4ca858 (diff) |
Call list progress
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.c | 5 |
1 files changed, 3 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 c1b5507fde..b2c9797b1a 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 @@ -57,13 +57,14 @@ static void merge_args_factory_unref(grpc_subchannel_factory *scf) { } static grpc_subchannel *merge_args_factory_create_subchannel( - grpc_subchannel_factory *scf, grpc_subchannel_args *args) { + grpc_subchannel_factory *scf, grpc_subchannel_args *args, + grpc_call_list *call_list) { merge_args_factory *f = (merge_args_factory *)scf; grpc_channel_args *final_args = grpc_channel_args_merge(args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel(f->wrapped, args); + s = grpc_subchannel_factory_create_subchannel(f->wrapped, args, call_list); grpc_channel_args_destroy(final_args); return s; } |