diff options
| author |  Vijay Pai <vpai@google.com> | 2016-08-30 10:20:20 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-08-30 10:20:20 -0700 |
| commit | de2aec810660c39b4fdf047d15b59bda64456373 (patch) | |
| tree | 673ce1f8b9ff1c5ba169237154b7f42a1169bd0b /include/grpc++/impl/codegen/server_context.h | |
| parent | 1ce6d33669fd1978f70e5aecb4ccb59fd0d5b2db (diff) | |
| parent | 7684c74b3cb4dc0b9cc631410feeb2aff7a496b8 (diff) | |
Merge branch 'master' into fc_unary
Resolve conflicts in ServerReaderWriterInterface
Remove file server_streamed_unary.h and merge with sync_stream.h
Diffstat (limited to 'include/grpc++/impl/codegen/server_context.h')
| -rw-r--r-- | include/grpc++/impl/codegen/server_context.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h index 8e101c3f15..157971e7c5 100644 --- a/include/grpc++/impl/codegen/server_context.h +++ b/include/grpc++/impl/codegen/server_context.h @@ -65,8 +65,10 @@ template <class R> class ServerReader; template <class W> class ServerWriter; +namespace internal { template <class W, class R> -class ServerReaderWriterInterface; +class ServerReaderWriterBody; +} template <class ServiceType, class RequestType, class ResponseType> class RpcMethodHandler; template <class ServiceType, class RequestType, class ResponseType> @@ -183,7 +185,7 @@ class ServerContext { template <class W> friend class ::grpc::ServerWriter; template <class W, class R> - friend class ::grpc::ServerReaderWriterInterface; + friend class ::grpc::internal::ServerReaderWriterBody; template <class ServiceType, class RequestType, class ResponseType> friend class RpcMethodHandler; template <class ServiceType, class RequestType, class ResponseType> |