diff options
| author |  Bogdan Drutu <bdrutu@google.com> | 2016-01-24 17:38:15 -0800 |
|---|---|---|
| committer | Bogdan Drutu <bdrutu@google.com> | 2016-01-24 17:38:15 -0800 |
| commit | 2ee3e8d7e85f34ce3b885731dbb77bf72a31fc86 (patch) | |
| tree | 15be512750d51fabf0382a0dcf25b28622e0a572 /src/cpp | |
| parent | 3e60e3228a88972a67057cd69edf3fe2c4d553db (diff) | |
| parent | e0a609365164417bef2fa130d2bacbb786fb9b03 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cpp')
| -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) {} |