Fixing merge failures.

pull/2612/head
Nicolas "Pixel" Noble 9 years ago
parent 9b6248fc6d
commit 720903ae6d
  1. 3
      src/csharp/ext/grpc_csharp_ext.c
  2. 3
      src/node/ext/channel.cc

@ -734,7 +734,8 @@ grpcsharp_call_start_serverside(grpc_call *call, grpcsharp_batch_context *ctx) {
(&ctx->recv_close_on_server_cancelled);
ops[0].flags = 0;
return grpc_call_start_batch(call, ops, sizeof(ops) / sizeof(ops[0]), ctx);
return grpc_call_start_batch(call, ops, sizeof(ops) / sizeof(ops[0]), ctx,
NULL);
}
GPR_EXPORT grpc_call_error GPR_CALLTYPE

@ -145,7 +145,8 @@ NAN_METHOD(Channel::New) {
return NanThrowTypeError("Channel expects a string and an object");
}
if (creds == NULL) {
wrapped_channel = grpc_insecure_channel_create(*host, channel_args_ptr);
wrapped_channel = grpc_insecure_channel_create(*host, channel_args_ptr,
NULL);
} else {
wrapped_channel =
grpc_secure_channel_create(creds, *host, channel_args_ptr);

Loading…
Cancel
Save