aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/channel
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-06-25 16:31:02 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-06-25 16:31:02 -0700
commit916246625bad68c6ea63d5a2cfca644a7e01cfe1 (patch)
treefe6eb56a6338eeffb5ff4f5105746f568713a1a1 /src/core/channel
parent2595ab7d96ce530e1ee1b1ed3d25311f18b1ca83 (diff)
Introduce connector, to help subchannel connect
Diffstat (limited to 'src/core/channel')
-rw-r--r--src/core/channel/channel_args.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/channel/channel_args.h b/src/core/channel/channel_args.h
index bf747b26e6..41f3a554d6 100644
--- a/src/core/channel/channel_args.h
+++ b/src/core/channel/channel_args.h
@@ -45,6 +45,8 @@ grpc_channel_args *grpc_channel_args_copy(const grpc_channel_args *src);
grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
const grpc_arg *to_add);
+grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, const grpc_channel_args *b);
+
/** Destroy arguments created by grpc_channel_args_copy */
void grpc_channel_args_destroy(grpc_channel_args *a);