diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/completion_queue.h | 2 | ||||
| -rw-r--r-- | include/grpc++/impl/call.h | 1 | ||||
| -rw-r--r-- | include/grpc/grpc.h | 4 | ||||
| -rw-r--r-- | include/grpc/support/slice_buffer.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h index a3e7a9c9f4..f32cbff06c 100644 --- a/include/grpc++/completion_queue.h +++ b/include/grpc++/completion_queue.h @@ -36,6 +36,7 @@ #include <grpc/support/time.h> #include <grpc++/impl/grpc_library.h> +#include <grpc++/status.h> #include <grpc++/time.h> struct grpc_completion_queue; @@ -70,7 +71,6 @@ class RpcMethod; class Server; class ServerBuilder; class ServerContext; -class Status; class CompletionQueueTag { public: diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h index 33e66816f5..64fa5d6efb 100644 --- a/include/grpc++/impl/call.h +++ b/include/grpc++/impl/call.h @@ -41,6 +41,7 @@ #include <grpc++/status.h> #include <grpc++/impl/serialization_traits.h> +#include <functional> #include <memory> #include <map> diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 8b4676562b..637f473b82 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -396,7 +396,9 @@ grpc_call *grpc_channel_create_registered_call( completion of type 'tag' to the completion queue bound to the call. The order of ops specified in the batch has no significance. Only one operation of each type can be active at once in any given - batch. + batch. You must call grpc_completion_queue_next or + grpc_completion_queue_pluck on the completion queue associated with 'call' + for work to be performed. THREAD SAFETY: access to grpc_call_start_batch in multi-threaded environment needs to be synchronized. As an optimization, you may synchronize batches containing just send operations independently from batches containing just diff --git a/include/grpc/support/slice_buffer.h b/include/grpc/support/slice_buffer.h index 1545dbfd76..ec048e8c91 100644 --- a/include/grpc/support/slice_buffer.h +++ b/include/grpc/support/slice_buffer.h @@ -84,6 +84,8 @@ void gpr_slice_buffer_pop(gpr_slice_buffer *sb); void gpr_slice_buffer_reset_and_unref(gpr_slice_buffer *sb); /* swap the contents of two slice buffers */ void gpr_slice_buffer_swap(gpr_slice_buffer *a, gpr_slice_buffer *b); +/* move all of the elements of src into dst */ +void gpr_slice_buffer_move_into(gpr_slice_buffer *src, gpr_slice_buffer *dst); #ifdef __cplusplus } |