diff options
author | Craig Tiller <ctiller@google.com> | 2016-03-31 08:48:18 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-03-31 08:48:18 -0700 |
commit | 3b27de1fc4486d1f62d9c557611ef507143bf120 (patch) | |
tree | 4fa3ca11e3a179048bce09f277334583d88c5518 /src/cpp/server | |
parent | 7503bd28e89cd676cbfcfeb3138d796029876e64 (diff) | |
parent | 6fa2ce56f3600b044d9e27897823de736e948a73 (diff) |
Merge github.com:grpc/grpc into split-me-baby-one-more-time
Diffstat (limited to 'src/cpp/server')
-rw-r--r-- | src/cpp/server/server.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 7e5f557ffa..5ec05e4dcc 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()); |