diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-12-08 13:03:05 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-12-08 13:56:39 -0800 |
| commit | 280281fd4dcef2f4958185cd73b62d70df6f1767 (patch) | |
| tree | 32c4c152bbf61e64f9946cb2a316af90124fcd3a /src/core/lib/transport/status_conversion.h | |
| parent | a77fb7dc6792a48edc30100482032844c56feedc (diff) | |
| parent | 94e676e10f8c739289924b8458a246699e3623ce (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into flow-control-part4
Diffstat (limited to 'src/core/lib/transport/status_conversion.h')
| -rw-r--r-- | src/core/lib/transport/status_conversion.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 3637b82801..107eb92a53 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -25,8 +25,7 @@ /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); -grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, - grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, grpc_millis deadline); /* Conversion of HTTP status codes (:status) to grpc status codes */ |