aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp/client
diff options
context:
space:
mode:
authorGravatar yang-g <yangg@google.com>2015-07-30 11:35:18 -0700
committerGravatar yang-g <yangg@google.com>2015-07-30 11:35:18 -0700
commitdcf6c90b33e306705f43eb13a773e451b12aa260 (patch)
tree77c9342d9abb19f5e4891b6a3fc308348a767cd4 /src/cpp/client
parentd7ead699f8503dbb2ec8ba470bb6c47cee2ddbee (diff)
parent2a21434cc5c50baec31e94e8fc613cfad331c690 (diff)
merge with head
Diffstat (limited to 'src/cpp/client')
-rw-r--r--src/cpp/client/create_channel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc
index 62f179d361..dbe2694a78 100644
--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@@ -51,7 +51,7 @@ std::shared_ptr<ChannelInterface> CreateChannel(
cp_args.SetString(GRPC_ARG_PRIMARY_USER_AGENT_STRING,
user_agent_prefix.str());
return creds ? creds->CreateChannel(target, cp_args)
- : std::shared_ptr<ChannelInterface>(
- new Channel(target, grpc_lame_client_channel_create(NULL)));
+ : std::shared_ptr<ChannelInterface>(new Channel(
+ target, grpc_lame_client_channel_create(NULL)));
}
} // namespace grpc