diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/async_unary_call.h | 2 | ||||
| -rw-r--r-- | include/grpc++/channel_arguments.h | 2 | ||||
| -rw-r--r-- | include/grpc++/server.h | 2 | ||||
| -rw-r--r-- | include/grpc/grpc_security.h | 3 | ||||
| -rw-r--r-- | include/grpc/support/slice_buffer.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/grpc++/async_unary_call.h b/include/grpc++/async_unary_call.h index f86a1ea518..658941bb6d 100644 --- a/include/grpc++/async_unary_call.h +++ b/include/grpc++/async_unary_call.h @@ -92,7 +92,7 @@ class ServerAsyncResponseWriter GRPC_FINAL explicit ServerAsyncResponseWriter(ServerContext* ctx) : call_(nullptr, nullptr, nullptr), ctx_(ctx) {} - void SendInitialMetadata(void* tag) { + void SendInitialMetadata(void* tag) GRPC_OVERRIDE { GPR_ASSERT(!ctx_->sent_initial_metadata_); meta_buf_.Reset(tag); diff --git a/include/grpc++/channel_arguments.h b/include/grpc++/channel_arguments.h index b649ba23b8..8d338c654e 100644 --- a/include/grpc++/channel_arguments.h +++ b/include/grpc++/channel_arguments.h @@ -66,7 +66,7 @@ class ChannelArguments { void SetChannelArgs(grpc_channel_args* channel_args) const; private: - friend class Channel; + friend class SecureCredentials; friend class testing::ChannelArgumentsTest; // TODO(yangg) implement copy and assign diff --git a/include/grpc++/server.h b/include/grpc++/server.h index cc9cbe2e8d..43c8432caf 100644 --- a/include/grpc++/server.h +++ b/include/grpc++/server.h @@ -96,7 +96,7 @@ class Server GRPC_FINAL : private CallHook, void RequestAsyncCall(void* registered_method, ServerContext* context, grpc::protobuf::Message* request, ServerAsyncStreamingInterface* stream, - CompletionQueue* cq, void* tag); + CompletionQueue* cq, void* tag) GRPC_OVERRIDE; // Completion queue. CompletionQueue cq_; diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index f94183457b..586cfcffe7 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -176,10 +176,9 @@ grpc_server_credentials *grpc_ssl_server_credentials_create( grpc_server_credentials *grpc_fake_transport_security_server_credentials_create( void); -/* --- Secure server creation. --- */ +/* --- Server-side secure ports. --- */ /* Add a HTTP2 over an encrypted link over tcp listener. - Server must have been created with grpc_secure_server_create. Returns bound port number on success, 0 on failure. REQUIRES: server not started */ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, diff --git a/include/grpc/support/slice_buffer.h b/include/grpc/support/slice_buffer.h index 56f71ef234..c7e5dbc647 100644 --- a/include/grpc/support/slice_buffer.h +++ b/include/grpc/support/slice_buffer.h @@ -74,6 +74,8 @@ void gpr_slice_buffer_addn(gpr_slice_buffer *sb, gpr_slice *slices, size_t n); /* add a very small (less than 8 bytes) amount of data to the end of a slice buffer: returns a pointer into which to add the data */ gpr_uint8 *gpr_slice_buffer_tiny_add(gpr_slice_buffer *sb, unsigned len); +/* pop the last buffer, but don't unref it */ +void gpr_slice_buffer_pop(gpr_slice_buffer *sb); /* clear a slice buffer, unref all elements */ void gpr_slice_buffer_reset_and_unref(gpr_slice_buffer *sb); |