From 7e18e6cf3fe6a93166b67d0614f5b69791887a63 Mon Sep 17 00:00:00 2001
From: Karthik Ravi Shankar <karthikrs@google.com>
Date: Wed, 5 Jun 2019 16:47:29 -0700
Subject: [PATCH] Fix clang errors.

---
 include/grpcpp/channel_impl.h                     | 5 +++--
 include/grpcpp/impl/codegen/channel_interface.h   | 2 +-
 include/grpcpp/impl/codegen/client_callback.h     | 2 +-
 include/grpcpp/impl/codegen/client_context_impl.h | 5 ++---
 include/grpcpp/impl/codegen/client_interceptor.h  | 7 ++++---
 include/grpcpp/impl/codegen/client_unary_call.h   | 8 ++++----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/grpcpp/channel_impl.h b/include/grpcpp/channel_impl.h
index 3ead8ee090e..a7eee2b8981 100644
--- a/include/grpcpp/channel_impl.h
+++ b/include/grpcpp/channel_impl.h
@@ -100,8 +100,9 @@ class Channel final : public ::grpc::ChannelInterface,
   ::grpc::CompletionQueue* CallbackCQ() override;
 
   ::grpc::internal::Call CreateCallInternal(
-      const ::grpc::internal::RpcMethod& method, ::grpc_impl::ClientContext* context,
-      ::grpc::CompletionQueue* cq, size_t interceptor_pos) override;
+      const ::grpc::internal::RpcMethod& method,
+      ::grpc_impl::ClientContext* context, ::grpc::CompletionQueue* cq,
+      size_t interceptor_pos) override;
 
   const grpc::string host_;
   grpc_channel* const c_channel_;  // owned
diff --git a/include/grpcpp/impl/codegen/channel_interface.h b/include/grpcpp/impl/codegen/channel_interface.h
index 9d0f07f3ff0..836c287e509 100644
--- a/include/grpcpp/impl/codegen/channel_interface.h
+++ b/include/grpcpp/impl/codegen/channel_interface.h
@@ -27,7 +27,7 @@
 namespace grpc_impl {
 class ClientContext;
 class CompletionQueue;
-}
+}  // namespace grpc_impl
 
 namespace grpc {
 class ChannelInterface;
diff --git a/include/grpcpp/impl/codegen/client_callback.h b/include/grpcpp/impl/codegen/client_callback.h
index bd438879543..6cba5830e4b 100644
--- a/include/grpcpp/impl/codegen/client_callback.h
+++ b/include/grpcpp/impl/codegen/client_callback.h
@@ -32,7 +32,7 @@
 namespace grpc_impl {
 class Channel;
 class ClientContext;
-}
+}  // namespace grpc_impl
 
 namespace grpc {
 
diff --git a/include/grpcpp/impl/codegen/client_context_impl.h b/include/grpcpp/impl/codegen/client_context_impl.h
index 76655c63d31..e730450a5c9 100644
--- a/include/grpcpp/impl/codegen/client_context_impl.h
+++ b/include/grpcpp/impl/codegen/client_context_impl.h
@@ -435,9 +435,8 @@ class ClientContext {
   grpc::experimental::ClientRpcInfo* set_client_rpc_info(
       const char* method, grpc::internal::RpcMethod::RpcType type,
       grpc::ChannelInterface* channel,
-      const std::vector<
-          std::unique_ptr<grpc::experimental::ClientInterceptorFactoryInterface>>&
-          creators,
+      const std::vector<std::unique_ptr<
+          grpc::experimental::ClientInterceptorFactoryInterface>>& creators,
       size_t interceptor_pos) {
     rpc_info_ = grpc::experimental::ClientRpcInfo(this, type, method, channel);
     rpc_info_.RegisterInterceptors(creators, interceptor_pos);
diff --git a/include/grpcpp/impl/codegen/client_interceptor.h b/include/grpcpp/impl/codegen/client_interceptor.h
index c0269edb16e..9e978b6a53e 100644
--- a/include/grpcpp/impl/codegen/client_interceptor.h
+++ b/include/grpcpp/impl/codegen/client_interceptor.h
@@ -30,7 +30,7 @@ namespace grpc_impl {
 
 class Channel;
 class ClientContext;
-}
+}  // namespace grpc_impl
 
 namespace grpc {
 
@@ -118,8 +118,9 @@ class ClientRpcInfo {
   ClientRpcInfo() = default;
 
   // Constructor will only be called from ClientContext
-  ClientRpcInfo(grpc_impl::ClientContext* ctx, internal::RpcMethod::RpcType type,
-                const char* method, grpc::ChannelInterface* channel)
+  ClientRpcInfo(grpc_impl::ClientContext* ctx,
+                internal::RpcMethod::RpcType type, const char* method,
+                grpc::ChannelInterface* channel)
       : ctx_(ctx),
         type_(static_cast<Type>(type)),
         method_(method),
diff --git a/include/grpcpp/impl/codegen/client_unary_call.h b/include/grpcpp/impl/codegen/client_unary_call.h
index d312aacf036..599dd1ecac9 100644
--- a/include/grpcpp/impl/codegen/client_unary_call.h
+++ b/include/grpcpp/impl/codegen/client_unary_call.h
@@ -36,8 +36,8 @@ class RpcMethod;
 /// Wrapper that performs a blocking unary call
 template <class InputMessage, class OutputMessage>
 Status BlockingUnaryCall(ChannelInterface* channel, const RpcMethod& method,
-                         grpc_impl::ClientContext* context, const InputMessage& request,
-                         OutputMessage* result) {
+                         grpc_impl::ClientContext* context,
+                         const InputMessage& request, OutputMessage* result) {
   return BlockingUnaryCallImpl<InputMessage, OutputMessage>(
              channel, method, context, request, result)
       .status();
@@ -47,8 +47,8 @@ template <class InputMessage, class OutputMessage>
 class BlockingUnaryCallImpl {
  public:
   BlockingUnaryCallImpl(ChannelInterface* channel, const RpcMethod& method,
-                        grpc_impl::ClientContext* context, const InputMessage& request,
-                        OutputMessage* result) {
+                        grpc_impl::ClientContext* context,
+                        const InputMessage& request, OutputMessage* result) {
     CompletionQueue cq(grpc_completion_queue_attributes{
         GRPC_CQ_CURRENT_VERSION, GRPC_CQ_PLUCK, GRPC_CQ_DEFAULT_POLLING,
         nullptr});  // Pluckable completion queue