diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-03-06 17:40:46 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-03-06 17:40:46 -0800 |
| commit | 3631e82c890de1ff0382ab3062b2d05193604046 (patch) | |
| tree | 9f999024080fb56afb24684c24adb2235ed1dfcc /src/cpp/client/create_channel.cc | |
| parent | 3aca2a624523e8bb27891d759b6fbbe71277be3d (diff) | |
| parent | ede76da1b5cb17f0a9d62c4b93c023c2fbaccc1a (diff) | |
Merge pull request #835 from ctiller/credit
C++ Credentials Rework
Diffstat (limited to 'src/cpp/client/create_channel.cc')
| -rw-r--r-- | src/cpp/client/create_channel.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc index 583e072799..57d215d0f3 100644 --- a/src/cpp/client/create_channel.cc +++ b/src/cpp/client/create_channel.cc @@ -40,14 +40,10 @@ namespace grpc { class ChannelArguments; -std::shared_ptr<ChannelInterface> CreateChannelDeprecated( - const grpc::string &target, const ChannelArguments &args) { - return std::shared_ptr<ChannelInterface>(new Channel(target, args)); -} - std::shared_ptr<ChannelInterface> CreateChannel( const grpc::string &target, const std::unique_ptr<Credentials> &creds, const ChannelArguments &args) { - return std::shared_ptr<ChannelInterface>(new Channel(target, creds, args)); + return creds ? creds->CreateChannel(target, args) : + std::shared_ptr<ChannelInterface>(new Channel(target, grpc_lame_client_channel_create())); } } // namespace grpc |