diff options
author | 2015-08-20 11:18:35 -0700 | |
---|---|---|
committer | 2015-08-20 11:18:35 -0700 | |
commit | c389bd22b7a293c536e5cf8e489019d239b680c6 (patch) | |
tree | a517da608ea627bbf080454c79b531780c5a0a5b /src/core/channel/client_channel.h | |
parent | fdc1dc744baa194f220a5d103ca73dde290c7d4b (diff) | |
parent | 43a53ffa0a1fadb6bb90ec814ac43da24a6d2684 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/core/channel/client_channel.h')
-rw-r--r-- | src/core/channel/client_channel.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/channel/client_channel.h b/src/core/channel/client_channel.h index cd81294eb3..13681e3956 100644 --- a/src/core/channel/client_channel.h +++ b/src/core/channel/client_channel.h @@ -59,11 +59,12 @@ void grpc_client_channel_watch_connectivity_state( grpc_channel_element *elem, grpc_connectivity_state *state, grpc_iomgr_closure *on_complete); -grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set(grpc_channel_element *elem); +grpc_pollset_set *grpc_client_channel_get_connecting_pollset_set( + grpc_channel_element *elem); void grpc_client_channel_add_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset); void grpc_client_channel_del_interested_party(grpc_channel_element *channel, - grpc_pollset *pollset); + grpc_pollset *pollset); #endif /* GRPC_INTERNAL_CORE_CHANNEL_CLIENT_CHANNEL_H */ |