diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-16 14:21:53 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-16 14:21:53 -0800 |
| commit | d4ed4fd17442ff18ed08702c20de1294f468bb38 (patch) | |
| tree | 7cfb34470824605fb2976498d56ffed970059520 /src/core/ext/client_channel/subchannel.h | |
| parent | 963be3727033668049a4de9f9ce1b507239e93f6 (diff) | |
| parent | 740665a6f65b3d827e0755de8bb1bcd57745b9f1 (diff) | |
Merge remote-tracking branch 'upstream/master' into security_handshaker3
Diffstat (limited to 'src/core/ext/client_channel/subchannel.h')
| -rw-r--r-- | src/core/ext/client_channel/subchannel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/client_channel/subchannel.h b/src/core/ext/client_channel/subchannel.h index 93bd72d20d..10bae620df 100644 --- a/src/core/ext/client_channel/subchannel.h +++ b/src/core/ext/client_channel/subchannel.h @@ -111,8 +111,8 @@ void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx, /** construct a subchannel call */ grpc_error *grpc_connected_subchannel_create_call( grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *connected_subchannel, - grpc_polling_entity *pollent, grpc_mdstr *path, gpr_timespec deadline, - grpc_subchannel_call **subchannel_call); + grpc_polling_entity *pollent, grpc_mdstr *path, gpr_timespec start_time, + gpr_timespec deadline, grpc_subchannel_call **subchannel_call); /** process a transport level op */ void grpc_connected_subchannel_process_transport_op( |