diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-28 14:33:17 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-28 14:33:17 -0700 |
| commit | 6c7185d350ef040fc3a2c0970de9268fd936504a (patch) | |
| tree | b0c7144667ef735f97997c3e9be2f22285ea653d /include | |
| parent | a1ad051d0ae30cf800c9bc27d3e7e35f0ccce55f (diff) | |
| parent | 808e5ae95f2fba44d2da925e8da0eaa5ce5c6585 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into credentials_naming_and_cleanup
Diffstat (limited to 'include')
| -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 a1488add1e..ce5a9e0606 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); |