diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-27 21:11:54 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-27 21:11:54 -0700 |
| commit | e535aacfac6d808c840e7966bcb6a4658f96fbb9 (patch) | |
| tree | 87d276fb8f43c3ad8c6cffef8cfdf8e051c7a63a /src/cpp/client/create_channel.cc | |
| parent | 240b7db1ca666a01f359fa1509be9c495b728827 (diff) | |
| parent | 2d487f2950367840402e8a40f314994dd695cc02 (diff) | |
Merge github.com:grpc/grpc into reject-the-stuffs
Diffstat (limited to 'src/cpp/client/create_channel.cc')
| -rw-r--r-- | src/cpp/client/create_channel.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc index 8c571cbbaa..1dac960017 100644 --- a/src/cpp/client/create_channel.cc +++ b/src/cpp/client/create_channel.cc @@ -44,6 +44,11 @@ namespace grpc { class ChannelArguments; std::shared_ptr<Channel> CreateChannel( + const grpc::string& target, const std::shared_ptr<Credentials>& creds) { + return CreateCustomChannel(target, creds, ChannelArguments()); +} + +std::shared_ptr<Channel> CreateCustomChannel( const grpc::string& target, const std::shared_ptr<Credentials>& creds, const ChannelArguments& args) { ChannelArguments cp_args = args; @@ -57,4 +62,5 @@ std::shared_ptr<Channel> CreateChannel( NULL, GRPC_STATUS_INVALID_ARGUMENT, "Invalid credentials.")); } + } // namespace grpc |