From 720903ae6da6a71641f57184b102b4385db64b99 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Wed, 12 Aug 2015 20:07:54 +0200
Subject: [PATCH] Fixing merge failures.
---
src/csharp/ext/grpc_csharp_ext.c | 3 ++-
src/node/ext/channel.cc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c
index 88f092573e..bf2bbd873b 100644
--- a/src/csharp/ext/grpc_csharp_ext.c
+++ b/src/csharp/ext/grpc_csharp_ext.c
@@ -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
diff --git a/src/node/ext/channel.cc b/src/node/ext/channel.cc
index 3ff310f172..45d0d09e22 100644
--- a/src/node/ext/channel.cc
+++ b/src/node/ext/channel.cc
@@ -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);
--
GitLab