diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-27 21:04:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-27 21:04:56 -0700 |
| commit | 89d56103eb9de65e148f1d839a686e591763d73e (patch) | |
| tree | 79b02327d46c9e34afcace37c222e07cdbd83cc9 /include/grpc++ | |
| parent | ee8d6a381adf3eaedf0c5d92aca7bd5b4b645de3 (diff) | |
| parent | 730055d9628ca6d27e46d7c6716148a8d93bf95d (diff) | |
Merge pull request #3104 from yang-g/create_channel
Create channel API change
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/create_channel.h | 6 | ||||
| -rw-r--r-- | include/grpc++/credentials.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/grpc++/create_channel.h b/include/grpc++/create_channel.h index 0e559ac53e..916f3b0b97 100644 --- a/include/grpc++/create_channel.h +++ b/include/grpc++/create_channel.h @@ -44,6 +44,12 @@ namespace grpc { // If creds does not hold an object or is invalid, a lame channel is returned. std::shared_ptr<Channel> CreateChannel( + const grpc::string& target, const std::shared_ptr<Credentials>& creds); + +// For advanced use and testing ONLY. Override default channel arguments only +// if necessary. +// If creds does not hold an object or is invalid, a lame channel is returned. +std::shared_ptr<Channel> CreateCustomChannel( const grpc::string& target, const std::shared_ptr<Credentials>& creds, const ChannelArguments& args); diff --git a/include/grpc++/credentials.h b/include/grpc++/credentials.h index 71e1f00f15..d623bcef60 100644 --- a/include/grpc++/credentials.h +++ b/include/grpc++/credentials.h @@ -57,7 +57,7 @@ class Credentials : public GrpcLibrary { virtual SecureCredentials* AsSecureCredentials() = 0; private: - friend std::shared_ptr<Channel> CreateChannel( + friend std::shared_ptr<Channel> CreateCustomChannel( const grpc::string& target, const std::shared_ptr<Credentials>& creds, const ChannelArguments& args); |