clang-format
diff --git a/include/grpc++/channel.h b/include/grpc++/channel.h
index f4035ee..d6f55a8 100644
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@@ -59,7 +59,8 @@
private:
template <class InputMessage, class OutputMessage>
- friend Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
+ friend Status BlockingUnaryCall(ChannelInterface* channel,
+ const RpcMethod& method,
ClientContext* context,
const InputMessage& request,
OutputMessage* result);
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h
index 6ce1c85..a926ed0 100644
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@@ -316,7 +316,8 @@
template <class R>
friend class ::grpc::ClientAsyncResponseReader;
template <class InputMessage, class OutputMessage>
- friend Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
+ friend Status BlockingUnaryCall(ChannelInterface* channel,
+ const RpcMethod& method,
ClientContext* context,
const InputMessage& request,
OutputMessage* result);
diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h
index adae926..c1f4172 100644
--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@@ -172,7 +172,8 @@
friend class ::grpc::Server;
friend class ::grpc::ServerContext;
template <class InputMessage, class OutputMessage>
- friend Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
+ friend Status BlockingUnaryCall(ChannelInterface* channel,
+ const RpcMethod& method,
ClientContext* context,
const InputMessage& request,
OutputMessage* result);
diff --git a/include/grpc++/generic/generic_stub.h b/include/grpc++/generic/generic_stub.h
index a24fcb4..5ac0371 100644
--- a/include/grpc++/generic/generic_stub.h
+++ b/include/grpc++/generic/generic_stub.h
@@ -47,7 +47,8 @@
// by name.
class GenericStub GRPC_FINAL {
public:
- explicit GenericStub(std::shared_ptr<ChannelInterface> channel) : channel_(channel) {}
+ explicit GenericStub(std::shared_ptr<ChannelInterface> channel)
+ : channel_(channel) {}
// begin a call to a named method
std::unique_ptr<GenericClientAsyncReaderWriter> Call(
diff --git a/include/grpc++/impl/codegen/channel_interface.h b/include/grpc++/impl/codegen/channel_interface.h
index 353f52c..d83b3fa 100644
--- a/include/grpc++/impl/codegen/channel_interface.h
+++ b/include/grpc++/impl/codegen/channel_interface.h
@@ -101,20 +101,21 @@
template <class R>
friend class ::grpc::ClientAsyncResponseReader;
template <class InputMessage, class OutputMessage>
- friend Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
+ friend Status BlockingUnaryCall(ChannelInterface* channel,
+ const RpcMethod& method,
ClientContext* context,
const InputMessage& request,
OutputMessage* result);
friend class ::grpc::RpcMethod;
virtual Call CreateCall(const RpcMethod& method, ClientContext* context,
- CompletionQueue* cq) = 0;
+ CompletionQueue* cq) = 0;
virtual void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) = 0;
virtual void* RegisterMethod(const char* method) = 0;
virtual void NotifyOnStateChangeImpl(grpc_connectivity_state last_observed,
- gpr_timespec deadline, CompletionQueue* cq,
- void* tag) = 0;
+ gpr_timespec deadline,
+ CompletionQueue* cq, void* tag) = 0;
virtual bool WaitForStateChangeImpl(grpc_connectivity_state last_observed,
- gpr_timespec deadline) = 0;
+ gpr_timespec deadline) = 0;
};
} // namespace grpc
diff --git a/include/grpc++/impl/codegen/server_interface.h b/include/grpc++/impl/codegen/server_interface.h
index 5c16fd4..1364bfe 100644
--- a/include/grpc++/impl/codegen/server_interface.h
+++ b/include/grpc++/impl/codegen/server_interface.h
@@ -100,7 +100,8 @@
/// \return bound port number on sucess, 0 on failure.
///
/// \warning It's an error to call this method on an already started server.
- virtual int AddListeningPort(const grpc::string& addr, ServerCredentials* creds) = 0;
+ virtual int AddListeningPort(const grpc::string& addr,
+ ServerCredentials* creds) = 0;
/// Start the server.
///
diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index 7ae94eb..c6af748 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -62,8 +62,7 @@
/// Models a gRPC server.
///
/// Servers are configured and started via \a grpc::ServerBuilder.
-class Server GRPC_FINAL : public ServerInterface,
- public GrpcLibrary {
+class Server GRPC_FINAL : public ServerInterface, public GrpcLibrary {
public:
~Server();
@@ -113,7 +112,8 @@
/// Register a service. This call does not take ownership of the service.
/// The service must exist for the lifetime of the Server instance.
- bool RegisterService(const grpc::string* host, Service* service) GRPC_OVERRIDE;
+ bool RegisterService(const grpc::string* host,
+ Service* service) GRPC_OVERRIDE;
/// Register a generic service. This call does not take ownership of the
/// service. The service must exist for the lifetime of the Server instance.
@@ -130,7 +130,8 @@
/// \return bound port number on sucess, 0 on failure.
///
/// \warning It's an error to call this method on an already started server.
- int AddListeningPort(const grpc::string& addr, ServerCredentials* creds) GRPC_OVERRIDE;
+ int AddListeningPort(const grpc::string& addr,
+ ServerCredentials* creds) GRPC_OVERRIDE;
/// Start the server.
///
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 49b78c3..a9a49f7 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -451,7 +451,8 @@
memset(&initial_metadata_array_, 0, sizeof(initial_metadata_array_));
}
-bool ServerInterface::BaseAsyncRequest::FinalizeResult(void** tag, bool* status) {
+bool ServerInterface::BaseAsyncRequest::FinalizeResult(void** tag,
+ bool* status) {
if (*status) {
for (size_t i = 0; i < initial_metadata_array_.count; i++) {
context_->client_metadata_.insert(
@@ -506,7 +507,8 @@
notification_cq->cq(), this);
}
-bool ServerInterface::GenericAsyncRequest::FinalizeResult(void** tag, bool* status) {
+bool ServerInterface::GenericAsyncRequest::FinalizeResult(void** tag,
+ bool* status) {
// TODO(yangg) remove the copy here.
if (*status) {
static_cast<GenericServerContext*>(context_)->method_ =
diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc
index dcee1f4..f840562 100644
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@@ -453,8 +453,7 @@
// Add a second service with one sync method.
TEST_F(HybridEnd2endTest, GenericEchoAsyncRequestStream_SyncDupService) {
EchoTestService::WithAsyncMethod_RequestStream<
- EchoTestService::WithGenericMethod_Echo<TestServiceImpl> >
- service;
+ EchoTestService::WithGenericMethod_Echo<TestServiceImpl> > service;
AsyncGenericService generic_service;
TestServiceImplDupPkg dup_service;
SetUpServer(&service, &dup_service, &generic_service);
@@ -473,8 +472,7 @@
// Add a second service with one async method.
TEST_F(HybridEnd2endTest, GenericEchoAsyncRequestStream_AsyncDupService) {
EchoTestService::WithAsyncMethod_RequestStream<
- EchoTestService::WithGenericMethod_Echo<TestServiceImpl> >
- service;
+ EchoTestService::WithGenericMethod_Echo<TestServiceImpl> > service;
AsyncGenericService generic_service;
duplicate::EchoTestService::AsyncService dup_service;
SetUpServer(&service, &dup_service, &generic_service);