diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-13 11:01:50 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-13 11:01:50 -0700 |
| commit | c6dfe859dc53adf87357f9d7f568c00cf25b0dcb (patch) | |
| tree | cc7bfed667536b87c0adb7bd89a0f427285327d0 /src/cpp | |
| parent | a587b4136976ab19f370b0ff18a2cd9f4c720cda (diff) | |
| parent | 6e51f992c6bfdfba61d984ab173305da455bd2e7 (diff) | |
Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/channel_cc.cc (renamed from src/cpp/client/channel.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 1 | ||||
| -rw-r--r-- | src/cpp/client/credentials_cc.cc (renamed from src/cpp/client/credentials.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/common/completion_queue_cc.cc (renamed from src/cpp/common/completion_queue.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/server/server_cc.cc (renamed from src/cpp/server/server.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/util/byte_buffer_cc.cc (renamed from src/cpp/util/byte_buffer.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/util/slice_cc.cc (renamed from src/cpp/util/slice.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/util/time_cc.cc (renamed from src/cpp/util/time.cc) | 0 |
8 files changed, 1 insertions, 0 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel_cc.cc index 43b3875cb3..43b3875cb3 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel_cc.cc diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 0ba77a5057..74bb7b0d1c 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -60,6 +60,7 @@ ClientContext::ClientContext() : initial_metadata_received_(false), fail_fast_(true), idempotent_(false), + cacheable_(false), call_(nullptr), call_canceled_(false), deadline_(gpr_inf_future(GPR_CLOCK_REALTIME)), diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials_cc.cc index e6a4f81b0d..e6a4f81b0d 100644 --- a/src/cpp/client/credentials.cc +++ b/src/cpp/client/credentials_cc.cc diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue_cc.cc index 00cc102f92..00cc102f92 100644 --- a/src/cpp/common/completion_queue.cc +++ b/src/cpp/common/completion_queue_cc.cc diff --git a/src/cpp/server/server.cc b/src/cpp/server/server_cc.cc index af04fd4ca6..af04fd4ca6 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server_cc.cc diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer_cc.cc index 91ed66b766..91ed66b766 100644 --- a/src/cpp/util/byte_buffer.cc +++ b/src/cpp/util/byte_buffer_cc.cc diff --git a/src/cpp/util/slice.cc b/src/cpp/util/slice_cc.cc index 7e88423b6c..7e88423b6c 100644 --- a/src/cpp/util/slice.cc +++ b/src/cpp/util/slice_cc.cc diff --git a/src/cpp/util/time.cc b/src/cpp/util/time_cc.cc index c43d848cc6..c43d848cc6 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time_cc.cc |