diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /src/node | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/ext/call.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc index 84a3e227c8..9f023b5883 100644 --- a/src/node/ext/call.cc +++ b/src/node/ext/call.cc @@ -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())) { |