diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-19 18:14:29 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-19 18:44:47 -0800 |
| commit | a701ed77592c18560326131cb37fcd5c29de83fe (patch) | |
| tree | 2dcdad6844ca2bce92633d44ce03f68520e39e2b /include/grpc++/generic | |
| parent | 4a0f8ea5355166706cabdd1ca984ae10341ab64b (diff) | |
| parent | 1f4e72c19c184eb9395d27e1c560c9c0cb1bfd4f (diff) | |
Merge branch 'proto_interfaces' into yang-g-sync_async_mix
Diffstat (limited to 'include/grpc++/generic')
| -rw-r--r-- | include/grpc++/generic/async_generic_service.h | 1 | ||||
| -rw-r--r-- | include/grpc++/generic/generic_stub.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/grpc++/generic/async_generic_service.h b/include/grpc++/generic/async_generic_service.h index 748311dbe7..9ae8391dc4 100644 --- a/include/grpc++/generic/async_generic_service.h +++ b/include/grpc++/generic/async_generic_service.h @@ -51,6 +51,7 @@ class GenericServerContext GRPC_FINAL : public ServerContext { private: friend class Server; + friend class ServerInterface; grpc::string method_; grpc::string host_; diff --git a/include/grpc++/generic/generic_stub.h b/include/grpc++/generic/generic_stub.h index 1bb7900b06..cd8fb54aed 100644 --- a/include/grpc++/generic/generic_stub.h +++ b/include/grpc++/generic/generic_stub.h @@ -47,7 +47,7 @@ typedef ClientAsyncReaderWriter<ByteBuffer, ByteBuffer> // by name. class GenericStub GRPC_FINAL { public: - explicit GenericStub(std::shared_ptr<Channel> channel) : channel_(channel) {} + explicit GenericStub(std::shared_ptr<ChannelInterface> channel) : channel_(channel) {} // begin a call to a named method std::unique_ptr<GenericClientAsyncReaderWriter> Call( @@ -55,7 +55,7 @@ class GenericStub GRPC_FINAL { void* tag); private: - std::shared_ptr<Channel> channel_; + std::shared_ptr<ChannelInterface> channel_; }; } // namespace grpc |