diff options
author | jiangtaoli2016 <jiangtao@google.com> | 2017-04-15 10:20:51 -0700 |
---|---|---|
committer | jiangtaoli2016 <jiangtao@google.com> | 2017-04-15 10:20:51 -0700 |
commit | e223a6a042b3123a2aee25ec0d3fe42ffd0c43e2 (patch) | |
tree | 041120a077b83bae9f461f8e62dac5b531babaa1 /src/node/ext/channel.cc | |
parent | c953b62d396d6168507520d837550f6b12d7e729 (diff) | |
parent | 644e05e79ba04fb0f424cbb8dffce6c3cd3913ec (diff) |
Merge branch 'master' into new_tsi
Diffstat (limited to 'src/node/ext/channel.cc')
-rw-r--r-- | src/node/ext/channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/ext/channel.cc b/src/node/ext/channel.cc index c795ff7f42..1263cc0d28 100644 --- a/src/node/ext/channel.cc +++ b/src/node/ext/channel.cc @@ -280,7 +280,7 @@ NAN_METHOD(Channel::WatchConnectivityState) { channel->wrapped_channel, last_state, MillisecondsToTimespec(deadline), GetCompletionQueue(), new struct tag(callback, - ops.release(), NULL)); + ops.release(), NULL, Nan::Null())); CompletionQueueNext(); } |