diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 07:35:37 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 07:35:37 -0700 |
| commit | abf03aed93e95c934143bcb986add21ed8ca239f (patch) | |
| tree | 4e290c0e0046ae8fd13a2c2fab46f5e69ab6dbf0 /include/grpc++/impl/codegen/call.h | |
| parent | 311e7badb80cceac466b57f03094844a2c289cf4 (diff) | |
| parent | d2f7268bc702d0bf2083b9dedb2ec07544b83dd2 (diff) | |
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
Diffstat (limited to 'include/grpc++/impl/codegen/call.h')
| -rw-r--r-- | include/grpc++/impl/codegen/call.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index f113aa0e45..e211373e7d 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -46,9 +46,9 @@ #include <grpc++/impl/codegen/core_codegen_interface.h> #include <grpc++/impl/codegen/serialization_traits.h> #include <grpc++/impl/codegen/status.h> +#include <grpc++/impl/codegen/status_helper.h> #include <grpc++/impl/codegen/string_ref.h> -#include <grpc/impl/codegen/alloc.h> #include <grpc/impl/codegen/compression_types.h> #include <grpc/impl/codegen/grpc_types.h> @@ -438,7 +438,7 @@ class CallOpServerSendStatus { trailing_metadata_count_ = trailing_metadata.size(); trailing_metadata_ = FillMetadataArray(trailing_metadata); send_status_available_ = true; - send_status_code_ = static_cast<grpc_status_code>(status.error_code()); + send_status_code_ = static_cast<grpc_status_code>(GetCanonicalCode(status)); send_status_details_ = status.error_message(); } |