diff options
author | 2016-01-25 12:53:50 -0800 | |
---|---|---|
committer | 2016-01-25 12:53:50 -0800 | |
commit | 541db25d45f548968386a17b9ca4726db912af4b (patch) | |
tree | e9320ac2058e5bd2ad2b7e424f6477265f709791 /src/cpp/server | |
parent | 28991142fac3277d5af6fe17d022a37740da09b6 (diff) | |
parent | 22f6dccec6bf1efd7e2a3cbb8e138662cf8d2e35 (diff) |
Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces
Diffstat (limited to 'src/cpp/server')
-rw-r--r-- | src/cpp/server/server_context.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 8193e70660..b3a74c7fce 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -122,6 +122,7 @@ ServerContext::ServerContext() : completion_op_(nullptr), has_notify_when_done_tag_(false), async_notify_when_done_tag_(nullptr), + deadline_(gpr_inf_future(GPR_CLOCK_REALTIME)), call_(nullptr), cq_(nullptr), sent_initial_metadata_(false) {} |