diff options
author | 2015-08-18 12:51:05 -0700 | |
---|---|---|
committer | 2015-08-18 12:51:05 -0700 | |
commit | 128f4a9cfe34825543dab4e29c875b59af40e666 (patch) | |
tree | 323e79e6d7dd98ef6aa23f93ec20736d10abd9ce /src/cpp/client/channel.cc | |
parent | f2066040d2568e6ae90f6690fab91c63cd17fd6b (diff) | |
parent | 4f21d3549c8f652a152ae086a74dd8415ecca8fa (diff) |
Merge github.com:grpc/grpc into y12kdm3
Diffstat (limited to 'src/cpp/client/channel.cc')
-rw-r--r-- | src/cpp/client/channel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 0582b59a6d..9695a0f14b 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -98,9 +98,8 @@ void Channel::PerformOpsOnCall(CallOpSetInterface* ops, Call* call) { } void* Channel::RegisterMethod(const char* method) { - return grpc_channel_register_call(c_channel_, method, - host_.empty() ? NULL : host_.c_str(), - nullptr); + return grpc_channel_register_call( + c_channel_, method, host_.empty() ? NULL : host_.c_str(), nullptr); } grpc_connectivity_state Channel::GetState(bool try_to_connect) { @@ -117,6 +116,7 @@ class TagSaver GRPC_FINAL : public CompletionQueueTag { delete this; return true; } + private: void* tag_; }; |