archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

Merged from master and resolved merge conflicts

Browse Source
This commit is contained in:
murgatroid99 2016-01-08 12:33:22 -08:00
commit 5bbf55f0db
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/call.cc
View File

@ -582,7 +582,7 @@ NAN_METHOD(Call::New) {
return Nan::ThrowTypeError(
"Call's fifth argument must be another call, if provided");
}
gpr_uint32 propagate_flags = GRPC_PROPAGATE_DEFAULTS;
uint32_t propagate_flags = GRPC_PROPAGATE_DEFAULTS;
if (info[5]->IsUint32()) {
propagate_flags = Nan::To<uint32_t>(info[5]).FromJust();
} else if (!(info[5]->IsUndefined() || info[5]->IsNull())) {