diff options
author | Mark D. Roth <roth@google.com> | 2017-01-09 09:36:47 -0800 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2017-01-09 09:36:47 -0800 |
commit | 1311e3448cacdaa4a4370986faaa33c3ce78730a (patch) | |
tree | f1fb2f588dae2f58743ac2466e7abcf3652b8fb4 /include | |
parent | fd9f53a20fc87d1ff70f38c850eb7f03296cfb60 (diff) | |
parent | 38b95b3a1515e31c83e23dd211e74ff9a7970c39 (diff) |
Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup
Diffstat (limited to 'include')
-rw-r--r-- | include/grpc++/grpc++.h | 4 | ||||
-rw-r--r-- | include/grpc++/impl/codegen/completion_queue.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/grpc++/grpc++.h b/include/grpc++/grpc++.h index 36d65d6ee1..daecfea406 100644 --- a/include/grpc++/grpc++.h +++ b/include/grpc++/grpc++.h @@ -44,6 +44,10 @@ /// peer, compression settings, authentication, etc. /// - grpc::Server, representing a gRPC server, created by grpc::ServerBuilder. /// +/// Streaming calls are handled with the streaming classes in +/// \ref sync_stream.h and +/// \ref async_stream.h. +/// /// Refer to the /// [examples](https://github.com/grpc/grpc/blob/master/examples/cpp) /// for code putting these pieces into play. diff --git a/include/grpc++/impl/codegen/completion_queue.h b/include/grpc++/impl/codegen/completion_queue.h index 944f2c3919..03cecdc21c 100644 --- a/include/grpc++/impl/codegen/completion_queue.h +++ b/include/grpc++/impl/codegen/completion_queue.h @@ -94,8 +94,10 @@ class ServerContext; extern CoreCodegenInterface* g_core_codegen_interface; -/// A thin wrapper around \a grpc_completion_queue (see / \a -/// src/core/surface/completion_queue.h). +/// A thin wrapper around \ref grpc_completion_queue (see \ref +/// src/core/lib/surface/completion_queue.h). +/// See \ref doc/cpp/perf_notes.md for notes on best practices for high +/// performance servers. class CompletionQueue : private GrpcLibraryCodegen { public: /// Default constructor. Implicitly creates a \a grpc_completion_queue |