diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-12-18 11:40:52 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-12-18 11:40:52 -0800 |
| commit | bb303513dce4e78d898035b9f7f5ae11b7b452dd (patch) | |
| tree | 708cacfd6a93bdfff3fa76e813afe909f3e62fe6 /include/grpcpp/security/credentials.h | |
| parent | 00c9c40004d011f01c72d253a530edb3364992bf (diff) | |
| parent | d198607457a6f5d47e8c134277ebfe3706f9476b (diff) | |
Merge master
Diffstat (limited to 'include/grpcpp/security/credentials.h')
| -rw-r--r-- | include/grpcpp/security/credentials.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h index 8dfbdec3e6..d8c9e04d77 100644 --- a/include/grpcpp/security/credentials.h +++ b/include/grpcpp/security/credentials.h @@ -46,8 +46,8 @@ std::shared_ptr<Channel> CreateCustomChannelWithInterceptors( const grpc::string& target, const std::shared_ptr<ChannelCredentials>& creds, const ChannelArguments& args, - std::unique_ptr<std::vector< - std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>> + std::vector< + std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> interceptor_creators); } // namespace experimental @@ -80,8 +80,8 @@ class ChannelCredentials : private GrpcLibraryCodegen { const grpc::string& target, const std::shared_ptr<ChannelCredentials>& creds, const ChannelArguments& args, - std::unique_ptr<std::vector< - std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>> + std::vector< + std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> interceptor_creators); virtual std::shared_ptr<Channel> CreateChannel( @@ -91,8 +91,8 @@ class ChannelCredentials : private GrpcLibraryCodegen { // implemented as a virtual function so that it does not break API. virtual std::shared_ptr<Channel> CreateChannelWithInterceptors( const grpc::string& target, const ChannelArguments& args, - std::unique_ptr<std::vector< - std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>> + std::vector< + std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> interceptor_creators) { return nullptr; }; |