diff options
author | Craig Tiller <ctiller@google.com> | 2015-01-13 11:13:42 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-01-13 11:13:42 -0800 |
commit | b5dcec5a2e917aebd0d59772ee4aa6737064494e (patch) | |
tree | d2b8011a5eaec439677d31e4a6385d6aef1e3c5c /include/grpc++ | |
parent | d8532af01c00ea46431e21c6000a5f7fe44110ca (diff) |
clang-format codebase
Diffstat (limited to 'include/grpc++')
-rw-r--r-- | include/grpc++/async_server_context.h | 2 | ||||
-rw-r--r-- | include/grpc++/channel_interface.h | 8 | ||||
-rw-r--r-- | include/grpc++/config.h | 1 | ||||
-rw-r--r-- | include/grpc++/credentials.h | 1 | ||||
-rw-r--r-- | include/grpc++/impl/rpc_service_method.h | 16 | ||||
-rw-r--r-- | include/grpc++/status_code_enum.h | 1 |
6 files changed, 16 insertions, 13 deletions
diff --git a/include/grpc++/async_server_context.h b/include/grpc++/async_server_context.h index 237a6856a4..c038286ac1 100644 --- a/include/grpc++/async_server_context.h +++ b/include/grpc++/async_server_context.h @@ -87,7 +87,7 @@ class AsyncServerContext { system_clock::time_point absolute_deadline_; google::protobuf::Message* request_; // not owned - grpc_call* call_; // owned + grpc_call* call_; // owned }; } // namespace grpc diff --git a/include/grpc++/channel_interface.h b/include/grpc++/channel_interface.h index 4b9d76e0d1..9ed35422b8 100644 --- a/include/grpc++/channel_interface.h +++ b/include/grpc++/channel_interface.h @@ -57,10 +57,10 @@ class ChannelInterface { const google::protobuf::Message& request, google::protobuf::Message* result) = 0; - virtual StreamContextInterface* CreateStream(const RpcMethod& method, - ClientContext* context, - const google::protobuf::Message* request, - google::protobuf::Message* result) = 0; + virtual StreamContextInterface* CreateStream( + const RpcMethod& method, ClientContext* context, + const google::protobuf::Message* request, + google::protobuf::Message* result) = 0; }; } // namespace grpc diff --git a/include/grpc++/config.h b/include/grpc++/config.h index 153b288f0c..52913fbf0f 100644 --- a/include/grpc++/config.h +++ b/include/grpc++/config.h @@ -39,7 +39,6 @@ namespace grpc { typedef std::string string; - } #endif // __GRPCPP_CONFIG_H__ diff --git a/include/grpc++/credentials.h b/include/grpc++/credentials.h index a8debbf7cf..987d890b4f 100644 --- a/include/grpc++/credentials.h +++ b/include/grpc++/credentials.h @@ -112,7 +112,6 @@ class CredentialsFactory { const grpc::string& authorization_token, const grpc::string& authority_selector); - // Combines two credentials objects into a composite credentials static std::unique_ptr<Credentials> ComposeCredentials( const std::unique_ptr<Credentials>& creds1, diff --git a/include/grpc++/impl/rpc_service_method.h b/include/grpc++/impl/rpc_service_method.h index 15ff9cab1a..620de5e67f 100644 --- a/include/grpc++/impl/rpc_service_method.h +++ b/include/grpc++/impl/rpc_service_method.h @@ -55,14 +55,17 @@ class MethodHandler { public: virtual ~MethodHandler() {} struct HandlerParameter { - HandlerParameter(ServerContext* context, const google::protobuf::Message* req, + HandlerParameter(ServerContext* context, + const google::protobuf::Message* req, google::protobuf::Message* resp) : server_context(context), request(req), response(resp), stream_context(nullptr) {} - HandlerParameter(ServerContext* context, const google::protobuf::Message* req, - google::protobuf::Message* resp, StreamContextInterface* stream) + HandlerParameter(ServerContext* context, + const google::protobuf::Message* req, + google::protobuf::Message* resp, + StreamContextInterface* stream) : server_context(context), request(req), response(resp), @@ -171,7 +174,8 @@ class RpcServiceMethod : public RpcMethod { public: // Takes ownership of the handler and two prototype objects. RpcServiceMethod(const char* name, RpcMethod::RpcType type, - MethodHandler* handler, google::protobuf::Message* request_prototype, + MethodHandler* handler, + google::protobuf::Message* request_prototype, google::protobuf::Message* response_prototype) : RpcMethod(name, type), handler_(handler), @@ -180,7 +184,9 @@ class RpcServiceMethod : public RpcMethod { MethodHandler* handler() { return handler_.get(); } - google::protobuf::Message* AllocateRequestProto() { return request_prototype_->New(); } + google::protobuf::Message* AllocateRequestProto() { + return request_prototype_->New(); + } google::protobuf::Message* AllocateResponseProto() { return response_prototype_->New(); } diff --git a/include/grpc++/status_code_enum.h b/include/grpc++/status_code_enum.h index 964420dcc4..4e0fda13db 100644 --- a/include/grpc++/status_code_enum.h +++ b/include/grpc++/status_code_enum.h @@ -34,7 +34,6 @@ #ifndef __GRPCPP_STATUS_CODE_ENUM_H__ #define __GRPCPP_STATUS_CODE_ENUM_H__ - namespace grpc { enum StatusCode { |