diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-12 15:16:35 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-12 15:16:35 -0700 |
| commit | b3d308b9a11496722754f4dc23ebb82a9f0e63d2 (patch) | |
| tree | d5c4d27375d08a91fdb71b6e84a2bb4558e28b52 /src/node/ext/server.cc | |
| parent | c20fa90c6094599540e3a7ef16a5aa381580be33 (diff) | |
| parent | 1b76bda4a61a0ed65d5a5de7a6f3363a47871e50 (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/node/ext/server.cc')
| -rw-r--r-- | src/node/ext/server.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc index ccb55aa54c..f0920c842a 100644 --- a/src/node/ext/server.cc +++ b/src/node/ext/server.cc @@ -193,7 +193,7 @@ NAN_METHOD(Server::RequestCall) { GetCompletionQueue(), GetCompletionQueue(), new struct tag(new Callback(info[0].As<Function>()), ops.release(), - NULL)); + NULL, Nan::Null())); if (error != GRPC_CALL_OK) { return Nan::ThrowError(nanErrorWithCode("requestCall failed", error)); } @@ -246,7 +246,7 @@ NAN_METHOD(Server::TryShutdown) { grpc_server_shutdown_and_notify( server->wrapped_server, GetCompletionQueue(), new struct tag(new Nan::Callback(info[0].As<Function>()), ops.release(), - NULL)); + NULL, Nan::Null())); CompletionQueueNext(); } |