aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp
diff options
context:
space:
mode:
authorGravatar yangg <yangg@google.com>2014-12-17 14:59:13 -0800
committerGravatar Nicolas Noble <nnoble@google.com>2014-12-17 15:55:56 -0800
commit081e2b0e63869397a50d247571278503d7a61d11 (patch)
treef663bf2922abecb5d13f343db332d6a9256b8af2 /src/cpp
parent4cb93718c720bb101c98c473878ffdd8051c611b (diff)
Replace the deprecated grpc_call_accept calls with the equivalent two new
calls. Change on 2014/12/17 by yangg <yangg@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82368034
Diffstat (limited to 'src/cpp')
-rw-r--r--src/cpp/server/async_server_context.cc3
-rw-r--r--src/cpp/stream/stream_context.cc6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/cpp/server/async_server_context.cc b/src/cpp/server/async_server_context.cc
index 5fd593158a..f44678b569 100644
--- a/src/cpp/server/async_server_context.cc
+++ b/src/cpp/server/async_server_context.cc
@@ -54,7 +54,8 @@ AsyncServerContext::AsyncServerContext(
AsyncServerContext::~AsyncServerContext() { grpc_call_destroy(call_); }
void AsyncServerContext::Accept(grpc_completion_queue* cq) {
- grpc_call_accept(call_, cq, this, 0);
+ GPR_ASSERT(grpc_call_server_accept(call_, cq, this) == GRPC_CALL_OK);
+ GPR_ASSERT(grpc_call_server_end_initial_metadata(call_, 0) == GRPC_CALL_OK);
}
bool AsyncServerContext::StartRead(google::protobuf::Message* request) {
diff --git a/src/cpp/stream/stream_context.cc b/src/cpp/stream/stream_context.cc
index f5d303d550..22b7e7d494 100644
--- a/src/cpp/stream/stream_context.cc
+++ b/src/cpp/stream/stream_context.cc
@@ -89,8 +89,10 @@ void StreamContext::Start(bool buffered) {
} else {
// TODO(yangg) metadata needs to be added before accept
// TODO(yangg) correctly set flag to accept
- grpc_call_error error = grpc_call_accept(call(), cq(), finished_tag(), 0);
- GPR_ASSERT(GRPC_CALL_OK == error);
+ GPR_ASSERT(grpc_call_server_accept(call(), cq(), finished_tag()) ==
+ GRPC_CALL_OK);
+ GPR_ASSERT(grpc_call_server_end_initial_metadata(call(), 0) ==
+ GRPC_CALL_OK);
}
}