aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreecha@users.noreply.github.com>2016-03-04 14:32:50 -0500
committerGravatar Sree Kuchibhotla <sreecha@users.noreply.github.com>2016-03-04 14:32:50 -0500
commitedd96e4926373644bac1c169431c213d361bed21 (patch)
treef471b62ef9ad25f06cb83b8f49b522c96a30ec27 /include/grpc++
parent22e53cbac6e9c153b935a681811593b8e8e65857 (diff)
Revert "Properly integrate async API with server-side cancellations."
Diffstat (limited to 'include/grpc++')
-rw-r--r--include/grpc++/impl/codegen/completion_queue.h1
-rw-r--r--include/grpc++/impl/codegen/server_context.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/include/grpc++/impl/codegen/completion_queue.h b/include/grpc++/impl/codegen/completion_queue.h
index 928ab2db31..102831e1c9 100644
--- a/include/grpc++/impl/codegen/completion_queue.h
+++ b/include/grpc++/impl/codegen/completion_queue.h
@@ -184,7 +184,6 @@ class CompletionQueue : private GrpcLibrary {
bool Pluck(CompletionQueueTag* tag);
/// Performs a single polling pluck on \a tag.
- /// \warning Must not be mixed with calls to \a Next.
void TryPluck(CompletionQueueTag* tag);
grpc_completion_queue* cq_; // owned
diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h
index 91ebe574b1..ad08b8210d 100644
--- a/include/grpc++/impl/codegen/server_context.h
+++ b/include/grpc++/impl/codegen/server_context.h
@@ -103,9 +103,6 @@ class ServerContext {
void AddInitialMetadata(const grpc::string& key, const grpc::string& value);
void AddTrailingMetadata(const grpc::string& key, const grpc::string& value);
- // IsCancelled is always safe to call when using sync API
- // When using async API, it is only safe to call IsCancelled after
- // the AsyncNotifyWhenDone tag has been delivered
bool IsCancelled() const;
// Cancel the Call from the server. This is a best-effort API and depending on