diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-05 14:05:38 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-05 14:05:38 -0700 |
| commit | 41f46ab665bccd39b15c78a0ae2923d5e1f2d078 (patch) | |
| tree | b8ba20b39b622aeb43229d9df657580b10902f76 /include/grpc++/impl | |
| parent | 4a647145f3463cbb0c2a489bb79803c57dd2d8bb (diff) | |
| parent | f8af6d9cf8d461ff3d93490583760c1f089452b6 (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'include/grpc++/impl')
| -rw-r--r-- | include/grpc++/impl/codegen/call.h | 1 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/core_codegen.h | 1 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/core_codegen_interface.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 56dd7b9685..95cc063281 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -530,6 +530,7 @@ class CallOpClientRecvStatus { void ClientRecvStatus(ClientContext* context, Status* status) { metadata_map_ = &context->trailing_metadata_; recv_status_ = status; + status_details_ = g_core_codegen_interface->grpc_empty_slice(); } protected: diff --git a/include/grpc++/impl/codegen/core_codegen.h b/include/grpc++/impl/codegen/core_codegen.h index b579849aca..a5f762e21d 100644 --- a/include/grpc++/impl/codegen/core_codegen.h +++ b/include/grpc++/impl/codegen/core_codegen.h @@ -79,6 +79,7 @@ class CoreCodegen : public CoreCodegenInterface { grpc_byte_buffer* grpc_raw_byte_buffer_create(grpc_slice* slice, size_t nslices) override; + grpc_slice grpc_empty_slice() override; grpc_slice grpc_slice_malloc(size_t length) override; void grpc_slice_unref(grpc_slice slice) override; grpc_slice grpc_slice_split_tail(grpc_slice* s, size_t split) override; diff --git a/include/grpc++/impl/codegen/core_codegen_interface.h b/include/grpc++/impl/codegen/core_codegen_interface.h index 12464591a4..a3df913c26 100644 --- a/include/grpc++/impl/codegen/core_codegen_interface.h +++ b/include/grpc++/impl/codegen/core_codegen_interface.h @@ -97,6 +97,7 @@ class CoreCodegenInterface { virtual void grpc_call_ref(grpc_call* call) = 0; virtual void grpc_call_unref(grpc_call* call) = 0; + virtual grpc_slice grpc_empty_slice() = 0; virtual grpc_slice grpc_slice_malloc(size_t length) = 0; virtual void grpc_slice_unref(grpc_slice slice) = 0; virtual grpc_slice grpc_slice_split_tail(grpc_slice* s, size_t split) = 0; |