diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-10 10:20:48 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-10-10 10:20:48 -0700 |
| commit | c99945e44ce40e52883c3c68cdb783eb395f9a03 (patch) | |
| tree | ed370f2e7b32f0b286d8377e73b3d1e4bc5078e7 /src/cpp | |
| parent | 1bb0ce5e23126692169765496221c58da7310a2b (diff) | |
| parent | fdc2b10dce93c806edc95eb76fdca38625c47d06 (diff) | |
Merge branch 'direct-calls' into buffer_pools_for_realsies
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/client_context.cc | 3 | ||||
| -rw-r--r-- | src/cpp/common/channel_filter.h | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 5b6aaa777b..b6008f47b1 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -59,7 +59,8 @@ static ClientContext::GlobalCallbacks* g_client_callbacks = ClientContext::ClientContext() : initial_metadata_received_(false), - fail_fast_(true), + wait_for_ready_(false), + wait_for_ready_explicitly_set_(false), idempotent_(false), cacheable_(false), call_(nullptr), diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index 6f5af3dec3..ae32e02f69 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -42,6 +42,7 @@ #include <vector> #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/metadata_batch.h" @@ -54,11 +55,6 @@ /// "name-of-filter", GRPC_SERVER_CHANNEL, INT_MAX, nullptr); /// \endcode -/// Forward declaration to avoid including the file -/// "src/core/lib/security/context/security_context.h" -struct grpc_client_security_context; -struct grpc_server_security_context; - namespace grpc { /// A C++ wrapper for the \c grpc_metadata_batch struct. |