diff options
| author |  Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-10-18 12:15:08 -0700 |
| commit | 9fa9315d62c3163a93eeae2b3d3bb70231567b83 (patch) | |
| tree | 49968018548e4a294026a9f95b8ea5363efceb0e /include/grpc++/impl | |
| parent | 23c5b812687d0ebb86ed86d64416b232f8771e56 (diff) | |
| parent | 948f95b2ce4204f859c867207bd991d30ca17ee7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fc_1dstream
Diffstat (limited to 'include/grpc++/impl')
| -rw-r--r-- | include/grpc++/impl/codegen/server_context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h index bce8d2c2f8..975f710f13 100644 --- a/include/grpc++/impl/codegen/server_context.h +++ b/include/grpc++/impl/codegen/server_context.h @@ -86,6 +86,7 @@ class ServerInterface; namespace testing { class InteropServerContextInspector; +class ServerContextTestSpouse; } // namespace testing // Interface of server side rpc context. @@ -173,6 +174,7 @@ class ServerContext { private: friend class ::grpc::testing::InteropServerContextInspector; + friend class ::grpc::testing::ServerContextTestSpouse; friend class ::grpc::ServerInterface; friend class ::grpc::Server; template <class W, class R> |