diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-09-25 13:37:58 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-09-25 13:37:58 -0700 |
| commit | 4fcf871806ed3a75a2da7e4b8e33fd288fc48456 (patch) | |
| tree | 73051d635ea2042233003cfaf57f5db405d61aa8 /include/grpc/grpc.h | |
| parent | cc0a1e1d7eca67f35f3c5bf002b1485df548e67e (diff) | |
| parent | ccbad108e45afb7c4fb361202cc0bae5ad7e5da2 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'include/grpc/grpc.h')
| -rw-r--r-- | include/grpc/grpc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index fc0a0d3cce..a9beee1c9e 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -111,7 +111,8 @@ GRPCAPI grpc_completion_queue* grpc_completion_queue_create_for_pluck( of GRPC_CQ_CALLBACK and grpc_cq_polling_type of GRPC_CQ_DEFAULT_POLLING. This function is experimental. */ GRPCAPI grpc_completion_queue* grpc_completion_queue_create_for_callback( - void* shutdown_callback, void* reserved); + grpc_experimental_completion_queue_functor* shutdown_callback, + void* reserved); /** Create a completion queue */ GRPCAPI grpc_completion_queue* grpc_completion_queue_create( @@ -500,7 +501,7 @@ GRPCAPI const grpc_arg_pointer_vtable* grpc_resource_quota_arg_vtable(void); GRPCAPI char* grpc_channelz_get_top_channels(intptr_t start_channel_id); /* Gets all servers that exist in the process. */ -GRPCAPI char* grpc_channelz_get_servers(intptr_t start_channel_id); +GRPCAPI char* grpc_channelz_get_servers(intptr_t start_server_id); /* Returns a single Channel, or else a NOT_FOUND code. The returned string is allocated and must be freed by the application. */ |