From 8c8588c7dc047ee509c7367f61ba0c5f00cb61d1 Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Sun, 22 Mar 2015 12:39:10 -0700
Subject: [PATCH] Remove dead members of server context
---
include/grpc++/server_context.h | 3 ---
src/cpp/server/server_context.cc | 6 ------
2 files changed, 9 deletions(-)
diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 9e3b80c641..36cbae87a0 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -78,8 +78,6 @@ class ServerContext {
void AddInitialMetadata(const grpc::string& key, const grpc::string& value);
void AddTrailingMetadata(const grpc::string& key, const grpc::string& value);
- bool IsCancelled();
-
const std::multimap<grpc::string, grpc::string>& client_metadata() {
return client_metadata_;
}
@@ -112,7 +110,6 @@ class ServerContext {
std::chrono::system_clock::time_point deadline_;
grpc_call* call_;
- CompletionQueue* cq_;
bool sent_initial_metadata_;
std::multimap<grpc::string, grpc::string> client_metadata_;
std::multimap<grpc::string, grpc::string> initial_metadata_;
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index bb3c2d1405..435a060be5 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -94,7 +94,6 @@ bool ServerContext::CompletionOp::FinalizeResult(void** tag, bool* status) {
ServerContext::ServerContext()
: completion_op_(nullptr),
call_(nullptr),
- cq_(nullptr),
sent_initial_metadata_(false) {}
ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata,
@@ -102,7 +101,6 @@ ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata,
: completion_op_(nullptr),
deadline_(Timespec2Timepoint(deadline)),
call_(nullptr),
- cq_(nullptr),
sent_initial_metadata_(false) {
for (size_t i = 0; i < metadata_count; i++) {
client_metadata_.insert(std::make_pair(
@@ -137,8 +135,4 @@ void ServerContext::AddTrailingMetadata(const grpc::string& key,
trailing_metadata_.insert(std::make_pair(key, value));
}
-bool ServerContext::IsCancelled() {
- return completion_op_ && completion_op_->CheckCancelled(cq_);
-}
-
} // namespace grpc
--
GitLab