Skip to content
Snippets Groups Projects
Commit c5273200 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #6534 from jtattermusch/clang38_fix_formatting

Fix formatting (to fix sanity check on master)
parents 38c6cfb8 b85e9d43
No related branches found
No related tags found
No related merge requests found
...@@ -44,10 +44,10 @@ namespace grpc { ...@@ -44,10 +44,10 @@ namespace grpc {
template <class ServiceType, class RequestType, class ResponseType> template <class ServiceType, class RequestType, class ResponseType>
class RpcMethodHandler : public MethodHandler { class RpcMethodHandler : public MethodHandler {
public: public:
RpcMethodHandler( RpcMethodHandler(std::function<Status(ServiceType*, ServerContext*,
std::function<Status(ServiceType*, ServerContext*, const RequestType*, const RequestType*, ResponseType*)>
ResponseType*)> func, func,
ServiceType* service) ServiceType* service)
: func_(func), service_(service) {} : func_(func), service_(service) {}
void RunHandler(const HandlerParameter& param) GRPC_FINAL { void RunHandler(const HandlerParameter& param) GRPC_FINAL {
...@@ -88,7 +88,8 @@ class ClientStreamingHandler : public MethodHandler { ...@@ -88,7 +88,8 @@ class ClientStreamingHandler : public MethodHandler {
public: public:
ClientStreamingHandler( ClientStreamingHandler(
std::function<Status(ServiceType*, ServerContext*, std::function<Status(ServiceType*, ServerContext*,
ServerReader<RequestType>*, ResponseType*)> func, ServerReader<RequestType>*, ResponseType*)>
func,
ServiceType* service) ServiceType* service)
: func_(func), service_(service) {} : func_(func), service_(service) {}
...@@ -124,7 +125,8 @@ class ServerStreamingHandler : public MethodHandler { ...@@ -124,7 +125,8 @@ class ServerStreamingHandler : public MethodHandler {
public: public:
ServerStreamingHandler( ServerStreamingHandler(
std::function<Status(ServiceType*, ServerContext*, const RequestType*, std::function<Status(ServiceType*, ServerContext*, const RequestType*,
ServerWriter<ResponseType>*)> func, ServerWriter<ResponseType>*)>
func,
ServiceType* service) ServiceType* service)
: func_(func), service_(service) {} : func_(func), service_(service) {}
......
...@@ -84,7 +84,8 @@ class ClientRpcContextUnaryImpl : public ClientRpcContext { ...@@ -84,7 +84,8 @@ class ClientRpcContextUnaryImpl : public ClientRpcContext {
std::function< std::function<
std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>( std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>(
BenchmarkService::Stub*, grpc::ClientContext*, const RequestType&, BenchmarkService::Stub*, grpc::ClientContext*, const RequestType&,
CompletionQueue*)> start_req, CompletionQueue*)>
start_req,
std::function<void(grpc::Status, ResponseType*)> on_done) std::function<void(grpc::Status, ResponseType*)> on_done)
: context_(), : context_(),
stub_(stub), stub_(stub),
...@@ -165,7 +166,8 @@ class AsyncClient : public ClientImpl<StubType, RequestType> { ...@@ -165,7 +166,8 @@ class AsyncClient : public ClientImpl<StubType, RequestType> {
AsyncClient(const ClientConfig& config, AsyncClient(const ClientConfig& config,
std::function<ClientRpcContext*( std::function<ClientRpcContext*(
StubType*, std::function<gpr_timespec()> next_issue, StubType*, std::function<gpr_timespec()> next_issue,
const RequestType&)> setup_ctx, const RequestType&)>
setup_ctx,
std::function<std::unique_ptr<StubType>(std::shared_ptr<Channel>)> std::function<std::unique_ptr<StubType>(std::shared_ptr<Channel>)>
create_stub) create_stub)
: ClientImpl<StubType, RequestType>(config, create_stub), : ClientImpl<StubType, RequestType>(config, create_stub),
...@@ -278,7 +280,8 @@ class ClientRpcContextStreamingImpl : public ClientRpcContext { ...@@ -278,7 +280,8 @@ class ClientRpcContextStreamingImpl : public ClientRpcContext {
std::function<std::unique_ptr< std::function<std::unique_ptr<
grpc::ClientAsyncReaderWriter<RequestType, ResponseType>>( grpc::ClientAsyncReaderWriter<RequestType, ResponseType>>(
BenchmarkService::Stub*, grpc::ClientContext*, CompletionQueue*, BenchmarkService::Stub*, grpc::ClientContext*, CompletionQueue*,
void*)> start_req, void*)>
start_req,
std::function<void(grpc::Status, ResponseType*)> on_done) std::function<void(grpc::Status, ResponseType*)> on_done)
: context_(), : context_(),
stub_(stub), stub_(stub),
...@@ -405,7 +408,8 @@ class ClientRpcContextGenericStreamingImpl : public ClientRpcContext { ...@@ -405,7 +408,8 @@ class ClientRpcContextGenericStreamingImpl : public ClientRpcContext {
std::function<gpr_timespec()> next_issue, std::function<gpr_timespec()> next_issue,
std::function<std::unique_ptr<grpc::GenericClientAsyncReaderWriter>( std::function<std::unique_ptr<grpc::GenericClientAsyncReaderWriter>(
grpc::GenericStub*, grpc::ClientContext*, grpc::GenericStub*, grpc::ClientContext*,
const grpc::string& method_name, CompletionQueue*, void*)> start_req, const grpc::string& method_name, CompletionQueue*, void*)>
start_req,
std::function<void(grpc::Status, ByteBuffer*)> on_done) std::function<void(grpc::Status, ByteBuffer*)> on_done)
: context_(), : context_(),
stub_(stub), stub_(stub),
......
...@@ -73,7 +73,8 @@ class AsyncQpsServerTest : public Server { ...@@ -73,7 +73,8 @@ class AsyncQpsServerTest : public Server {
CompletionQueue *, ServerCompletionQueue *, void *)> CompletionQueue *, ServerCompletionQueue *, void *)>
request_streaming_function, request_streaming_function,
std::function<grpc::Status(const PayloadConfig &, const RequestType *, std::function<grpc::Status(const PayloadConfig &, const RequestType *,
ResponseType *)> process_rpc) ResponseType *)>
process_rpc)
: Server(config) { : Server(config) {
char *server_address = NULL; char *server_address = NULL;
...@@ -190,7 +191,8 @@ class AsyncQpsServerTest : public Server { ...@@ -190,7 +191,8 @@ class AsyncQpsServerTest : public Server {
ServerRpcContextUnaryImpl( ServerRpcContextUnaryImpl(
std::function<void(ServerContextType *, RequestType *, std::function<void(ServerContextType *, RequestType *,
grpc::ServerAsyncResponseWriter<ResponseType> *, grpc::ServerAsyncResponseWriter<ResponseType> *,
void *)> request_method, void *)>
request_method,
std::function<grpc::Status(const RequestType *, ResponseType *)> std::function<grpc::Status(const RequestType *, ResponseType *)>
invoke_method) invoke_method)
: srv_ctx_(new ServerContextType), : srv_ctx_(new ServerContextType),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment