From d2565bb169d052d5baec9b43e126b44676d53178 Mon Sep 17 00:00:00 2001
From: David Garcia Quintas <dgq@google.com>
Date: Wed, 13 Jan 2016 10:07:14 -0800
Subject: [PATCH] Fixed formatting and updated gen script to use concrete
 version of clang-format

---
 src/core/proto/grpc/lb/v0/load_balancer.pb.h  | 20 +++++++++++++++----
 .../codegen/core/gen_load_balancing_proto.sh  |  4 ++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/core/proto/grpc/lb/v0/load_balancer.pb.h b/src/core/proto/grpc/lb/v0/load_balancer.pb.h
index 8a90405c618..ac836658399 100644
--- a/src/core/proto/grpc/lb/v0/load_balancer.pb.h
+++ b/src/core/proto/grpc/lb/v0/load_balancer.pb.h
@@ -129,8 +129,14 @@ typedef struct _grpc_lb_v0_LoadBalanceResponse {
   }
 #define grpc_lb_v0_InitialLoadBalanceResponse_init_default \
   { false, "", false, "", false, grpc_lb_v0_Duration_init_default }
-#define grpc_lb_v0_ServerList_init_default \
-  { {{NULL}, NULL}, false, grpc_lb_v0_Duration_init_default }
+#define grpc_lb_v0_ServerList_init_default    \
+  {                                           \
+    {                                         \
+      { NULL }                                \
+      , NULL                                  \
+    }                                         \
+    , false, grpc_lb_v0_Duration_init_default \
+  }
 #define grpc_lb_v0_Server_init_default \
   { false, "", false, 0, false, {0, {0}}, false, 0 }
 #define grpc_lb_v0_Duration_init_zero \
@@ -151,8 +157,14 @@ typedef struct _grpc_lb_v0_LoadBalanceResponse {
   }
 #define grpc_lb_v0_InitialLoadBalanceResponse_init_zero \
   { false, "", false, "", false, grpc_lb_v0_Duration_init_zero }
-#define grpc_lb_v0_ServerList_init_zero \
-  { {{NULL}, NULL}, false, grpc_lb_v0_Duration_init_zero }
+#define grpc_lb_v0_ServerList_init_zero    \
+  {                                        \
+    {                                      \
+      { NULL }                             \
+      , NULL                               \
+    }                                      \
+    , false, grpc_lb_v0_Duration_init_zero \
+  }
 #define grpc_lb_v0_Server_init_zero \
   { false, "", false, 0, false, {0, {0}}, false, 0 }
 
diff --git a/tools/codegen/core/gen_load_balancing_proto.sh b/tools/codegen/core/gen_load_balancing_proto.sh
index 31f1b896967..bdad68a7f82 100755
--- a/tools/codegen/core/gen_load_balancing_proto.sh
+++ b/tools/codegen/core/gen_load_balancing_proto.sh
@@ -121,7 +121,7 @@ mv $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
 cat $COPYRIGHT_FILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h" > $TMPFILE
 mv $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
 
-clang-format -style="{BasedOnStyle: Google, Language: Cpp}" -i "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
-clang-format -style="{BasedOnStyle: Google, Language: Cpp}" -i "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
+clang-format-3.6 -style="{BasedOnStyle: Google, Language: Cpp}" -i "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
+clang-format-3.6 -style="{BasedOnStyle: Google, Language: Cpp}" -i "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
 
 popd > /dev/null