clang-format

4 files changed, 45 insertions, 32 deletions

diff --git a/include/grpc++/impl/codegen/method_handler_impl.h b/include/grpc++/impl/codegen/method_handler_impl.h
index 3a671fe830..ef803483ea 100644
--- a/include/grpc++/impl/codegen/method_handler_impl.h
+++ b/include/grpc++/impl/codegen/method_handler_impl.h
@@ -178,9 +178,8 @@ template <class Streamer, bool WriteNeeded>
 class TemplatedBidiStreamingHandler : public MethodHandler {
  public:
   TemplatedBidiStreamingHandler(
-      std::function<Status(ServerContext*, Streamer*)>
-          func)
-    : func_(func), write_needed_(WriteNeeded) {}
+      std::function<Status(ServerContext*, Streamer*)> func)
+      : func_(func), write_needed_(WriteNeeded) {}
 
   void RunHandler(const HandlerParameter& param) GRPC_FINAL {
     Streamer stream(param.call, param.server_context);
@@ -194,10 +193,10 @@ class TemplatedBidiStreamingHandler : public MethodHandler {
         ops.set_compression_level(param.server_context->compression_level());
       }
       if (write_needed_ && status.ok()) {
-	// If we needed a write but never did one, we need to mark the
-	// status as a fail
-	status = Status(IMPROPER_IMPLEMENTATION,
-			"Service did not provide response message");
+        // If we needed a write but never did one, we need to mark the
+        // status as a fail
+        status = Status(IMPROPER_IMPLEMENTATION,
+                        "Service did not provide response message");
       }
     }
     ops.ServerSendStatus(param.server_context->trailing_metadata_, status);
@@ -206,24 +205,37 @@ class TemplatedBidiStreamingHandler : public MethodHandler {
   }
 
  private:
-  std::function<Status(ServerContext*, Streamer*)>
-    func_;
+  std::function<Status(ServerContext*, Streamer*)> func_;
   const bool write_needed_;
 };
 
 template <class ServiceType, class RequestType, class ResponseType>
-  class BidiStreamingHandler : public TemplatedBidiStreamingHandler<ServerReaderWriter<ResponseType, RequestType>, false> {
+class BidiStreamingHandler
+    : public TemplatedBidiStreamingHandler<
+          ServerReaderWriter<ResponseType, RequestType>, false> {
  public:
-  BidiStreamingHandler(std::function<Status(ServiceType*, ServerContext*,
-					    ServerReaderWriter<ResponseType,RequestType>*)> func, ServiceType* service): TemplatedBidiStreamingHandler<ServerReaderWriter<ResponseType, RequestType>,false>(std::bind(func, service, std::placeholders::_1, std::placeholders::_2)) {}
- };
+  BidiStreamingHandler(
+      std::function<Status(ServiceType*, ServerContext*,
+                           ServerReaderWriter<ResponseType, RequestType>*)>
+          func,
+      ServiceType* service)
+      : TemplatedBidiStreamingHandler<
+            ServerReaderWriter<ResponseType, RequestType>, false>(std::bind(
+            func, service, std::placeholders::_1, std::placeholders::_2)) {}
+};
 
- template <class RequestType, class ResponseType>
-   class StreamedUnaryHandler : public TemplatedBidiStreamingHandler<ServerUnaryStreamer<RequestType, ResponseType>, true> {
+template <class RequestType, class ResponseType>
+class StreamedUnaryHandler
+    : public TemplatedBidiStreamingHandler<
+          ServerUnaryStreamer<RequestType, ResponseType>, true> {
  public:
- explicit StreamedUnaryHandler(std::function<Status(ServerContext*,
-					    ServerUnaryStreamer<RequestType,ResponseType>*)> func): TemplatedBidiStreamingHandler<ServerUnaryStreamer<RequestType, ResponseType>, true>(func) {}
- };
+  explicit StreamedUnaryHandler(
+      std::function<Status(ServerContext*,
+                           ServerUnaryStreamer<RequestType, ResponseType>*)>
+          func)
+      : TemplatedBidiStreamingHandler<
+            ServerUnaryStreamer<RequestType, ResponseType>, true>(func) {}
+};
 
 // Handle unknown method by returning UNIMPLEMENTED error.
 class UnknownMethodHandler : public MethodHandler {
diff --git a/include/grpc++/impl/codegen/service_type.h b/include/grpc++/impl/codegen/service_type.h
index 9d2a80cbc4..72b2225312 100644
--- a/include/grpc++/impl/codegen/service_type.h
+++ b/include/grpc++/impl/codegen/service_type.h
@@ -148,7 +148,7 @@ class Service {
   }
 
   void MarkMethodStreamedUnary(int index,
-			       MethodHandler* streamed_unary_method) {
+                               MethodHandler* streamed_unary_method) {
     GPR_CODEGEN_ASSERT(methods_[index] && methods_[index]->handler() &&
                        "Cannot mark an async or generic method Streamed Unary");
     methods_[index]->SetHandler(streamed_unary_method);
diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc
index 7c70567d12..744d3d62e8 100644
--- a/src/compiler/cpp_generator.cc
+++ b/src/compiler/cpp_generator.cc
@@ -616,7 +616,7 @@ void PrintHeaderServerMethodStreamedUnary(
     printer->Print(*vars, "template <class BaseClass>\n");
     printer->Print(*vars,
                    "class WithStreamedUnaryMethod_$Method$ : "
-		   "public BaseClass {\n");
+                   "public BaseClass {\n");
     printer->Print(
         " private:\n"
         "  void BaseClassMustBeDerivedFromService(const Service *service) "
@@ -628,9 +628,9 @@ void PrintHeaderServerMethodStreamedUnary(
                    "  ::grpc::Service::MarkMethodStreamedUnary($Idx$,\n"
                    "    new ::grpc::StreamedUnaryHandler<$Request$, "
                    "$Response$>(std::bind"
-		   "(&WithStreamedUnaryMethod_$Method$<BaseClass>::"
+                   "(&WithStreamedUnaryMethod_$Method$<BaseClass>::"
                    "Streamed$Method$, this, std::placeholders::_1, "
-		   "std::placeholders::_2)));\n"
+                   "std::placeholders::_2)));\n"
                    "}\n");
     printer->Print(*vars,
                    "~WithStreamedUnaryMethod_$Method$() GRPC_OVERRIDE {\n"
@@ -649,7 +649,7 @@ void PrintHeaderServerMethodStreamedUnary(
                    "// replace default version of method with streamed unary\n"
                    "virtual ::grpc::Status Streamed$Method$("
                    "::grpc::ServerContext* context, "
-		   "::grpc::ServerUnaryStreamer< "
+                   "::grpc::ServerUnaryStreamer< "
                    "$Request$,$Response$>* server_unary_streamer)"
                    " = 0;\n");
     printer->Outdent();
@@ -827,7 +827,7 @@ void PrintHeaderService(Printer *printer, const Service *service,
   for (int i = 0; i < service->method_count(); ++i) {
     (*vars)["Idx"] = as_string(i);
     PrintHeaderServerMethodStreamedUnary(printer, service->method(i).get(),
-					 vars);
+                                         vars);
   }
 
   printer->Print("typedef ");
diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc
index eb7125cb04..a6ea13aa8b 100644
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@@ -422,13 +422,13 @@ TEST_F(HybridEnd2endTest, AsyncRequestStreamResponseStream_SyncDupService) {
 }
 
 // Add a second service with one sync streamed unary method.
-class StreamedUnaryDupPkg : public
-    duplicate::EchoTestService::WithStreamedUnaryMethod_Echo<
-                          TestServiceImplDupPkg> {
+class StreamedUnaryDupPkg
+    : public duplicate::EchoTestService::WithStreamedUnaryMethod_Echo<
+          TestServiceImplDupPkg> {
  public:
   Status StreamedEcho(ServerContext* context,
-		      ServerUnaryStreamer<EchoRequest, EchoResponse>* stream)
-    GRPC_OVERRIDE {
+                      ServerUnaryStreamer<EchoRequest, EchoResponse>* stream)
+      GRPC_OVERRIDE {
     EchoRequest req;
     EchoResponse resp;
     uint32_t next_msg_sz;
@@ -461,11 +461,12 @@ TEST_F(HybridEnd2endTest,
 }
 
 // Add a second service that is fully Streamed Unary
-class FullyStreamedUnaryDupPkg : public duplicate::EchoTestService::StreamedUnaryService {
+class FullyStreamedUnaryDupPkg
+    : public duplicate::EchoTestService::StreamedUnaryService {
  public:
   Status StreamedEcho(ServerContext* context,
-		      ServerUnaryStreamer<EchoRequest, EchoResponse>* stream)
-    GRPC_OVERRIDE {
+                      ServerUnaryStreamer<EchoRequest, EchoResponse>* stream)
+      GRPC_OVERRIDE {
     EchoRequest req;
     EchoResponse resp;
     uint32_t next_msg_sz;