diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-10-02 13:50:24 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-10-02 13:50:24 -0700 |
| commit | 28bf559ee2c80486b837a9bd6bdff1713d07cb26 (patch) | |
| tree | 430039fdd26879af82e76d6e3a1013a588e295d2 /src/cpp/server | |
| parent | 91ad018c0026dc231e73ede1db17ef5e329d453c (diff) | |
| parent | 1f8efa266d585dc5a4d450da3b27e758e71d3250 (diff) | |
Merge remote-tracking branch 'upstream/master' into interop_improvements
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/secure_server_credentials.cc | 8 | ||||
| -rw-r--r-- | src/cpp/server/server.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_builder.cc | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc index 7c828cb125..d472667a7e 100644 --- a/src/cpp/server/secure_server_credentials.cc +++ b/src/cpp/server/secure_server_credentials.cc @@ -35,7 +35,6 @@ #include <map> #include <memory> - #include "src/cpp/common/secure_auth_context.h" #include "src/cpp/server/secure_server_credentials.h" @@ -43,7 +42,7 @@ namespace grpc { -void AuthMetadataProcessorAyncWrapper::Destroy(void *wrapper) { +void AuthMetadataProcessorAyncWrapper::Destroy(void* wrapper) { auto* w = reinterpret_cast<AuthMetadataProcessorAyncWrapper*>(wrapper); delete w; } @@ -68,8 +67,7 @@ void AuthMetadataProcessorAyncWrapper::Process( } void AuthMetadataProcessorAyncWrapper::InvokeProcessor( - grpc_auth_context* ctx, - const grpc_metadata* md, size_t num_md, + grpc_auth_context* ctx, const grpc_metadata* md, size_t num_md, grpc_process_auth_metadata_done_cb cb, void* user_data) { AuthMetadataProcessor::InputMetadata metadata; for (size_t i = 0; i < num_md; i++) { @@ -117,7 +115,7 @@ int SecureServerCredentials::AddPortToServer(const grpc::string& addr, void SecureServerCredentials::SetAuthMetadataProcessor( const std::shared_ptr<AuthMetadataProcessor>& processor) { - auto *wrapper = new AuthMetadataProcessorAyncWrapper(processor); + auto* wrapper = new AuthMetadataProcessorAyncWrapper(processor); grpc_server_credentials_set_auth_metadata_processor( creds_, {AuthMetadataProcessorAyncWrapper::Process, AuthMetadataProcessorAyncWrapper::Destroy, wrapper}); diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index a3020c342b..a44e1d2025 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -325,7 +325,7 @@ bool Server::RegisterAsyncService(const grpc::string* host, GPR_ASSERT(service->server_ == nullptr && "Can only register an asynchronous service against one server."); service->server_ = this; - service->request_args_ = new void*[service->method_count_]; + service->request_args_ = new void* [service->method_count_]; for (size_t i = 0; i < service->method_count_; ++i) { void* tag = grpc_server_register_method(server_, service->method_names_[i], host ? host->c_str() : nullptr); diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 1c7e4e4eb6..b8094aa8f6 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -44,7 +44,7 @@ namespace grpc { ServerBuilder::ServerBuilder() : max_message_size_(-1), generic_service_(nullptr), thread_pool_(nullptr) { - grpc_compression_options_init(&compression_options_); + grpc_compression_options_init(&compression_options_); } std::unique_ptr<ServerCompletionQueue> ServerBuilder::AddCompletionQueue() { |