aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-31 07:49:58 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-31 07:49:58 -0700
commit64a12c55dfe4bdbdb65b2c508a06f4335f100a98 (patch)
tree27210a0df4e73a44487d89dc012502fa5d992ee4 /src/cpp
parent6169d5f7b002a68daa3eda36798cec34de11d57f (diff)
parent6fa2ce56f3600b044d9e27897823de736e948a73 (diff)
Merge github.com:grpc/grpc into copyright-fix
Diffstat (limited to 'src/cpp')
-rw-r--r--src/cpp/server/server.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 76f8971631..3e44c502fc 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -264,6 +264,7 @@ class Server::SyncRequest GRPC_FINAL : public CompletionQueueTag {
void* const tag_;
bool in_flight_;
const bool has_request_payload_;
+ uint32_t incoming_flags_;
grpc_call* call_;
grpc_call_details* call_details_;
gpr_timespec deadline_;
@@ -334,7 +335,7 @@ bool Server::RegisterService(const grpc::string* host, Service* service) {
}
RpcServiceMethod* method = it->get();
void* tag = grpc_server_register_method(server_, method->name(),
- host ? host->c_str() : nullptr);
+ host ? host->c_str() : nullptr, 0);
if (tag == nullptr) {
gpr_log(GPR_DEBUG, "Attempt to register %s multiple times",
method->name());