diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2018-12-10 10:15:45 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-12-10 10:15:45 -0800 |
| commit | 037173217011b38ff4675d028eba27a068db5975 (patch) | |
| tree | 7bf135f4481365dad05cb4ce181cc8259647a3da /include/grpcpp/channel.h | |
| parent | 3f00d61b04874cc5f0159c16f2c598a8f2fb93a7 (diff) | |
| parent | 60f2d379fec3364ff59f4f0d463b16275525863d (diff) | |
Merge branch 'master' into config-isolation
Diffstat (limited to 'include/grpcpp/channel.h')
| -rw-r--r-- | include/grpcpp/channel.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/grpcpp/channel.h b/include/grpcpp/channel.h index b7c9e354de..ee83396069 100644 --- a/include/grpcpp/channel.h +++ b/include/grpcpp/channel.h @@ -20,6 +20,7 @@ #define GRPCPP_CHANNEL_H #include <memory> +#include <mutex> #include <grpc/grpc.h> #include <grpcpp/impl/call.h> @@ -64,12 +65,13 @@ class Channel final : public ChannelInterface, friend void experimental::ChannelResetConnectionBackoff(Channel* channel); friend std::shared_ptr<Channel> CreateChannelInternal( const grpc::string& host, grpc_channel* c_channel, - std::unique_ptr<std::vector< - std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>> + std::vector< + std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> interceptor_creators); + friend class internal::InterceptedChannel; Channel(const grpc::string& host, grpc_channel* c_channel, - std::unique_ptr<std::vector< - std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>> + std::vector< + std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> interceptor_creators); internal::Call CreateCall(const internal::RpcMethod& method, @@ -87,6 +89,10 @@ class Channel final : public ChannelInterface, CompletionQueue* CallbackCQ() override; + internal::Call CreateCallInternal(const internal::RpcMethod& method, + ClientContext* context, CompletionQueue* cq, + size_t interceptor_pos) override; + const grpc::string host_; grpc_channel* const c_channel_; // owned |