diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-26 13:16:37 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-26 13:16:37 -0800 |
| commit | c3b6d3a3eb744596a45922117adee1e73dc1652d (patch) | |
| tree | f5f7267afc9114fb5433eba87e11f630e8c964b4 /src/node/ext/call.cc | |
| parent | ce7b981577606378e4002f74791c085b018e9215 (diff) | |
Fix merge error
Diffstat (limited to 'src/node/ext/call.cc')
| -rw-r--r-- | src/node/ext/call.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc index ff6b153c53..ffa9b976b3 100644 --- a/src/node/ext/call.cc +++ b/src/node/ext/call.cc @@ -352,14 +352,9 @@ class GetMetadataOp : public Op { return scope.Escape(ParseMetadata(&recv_metadata)); } -<<<<<<< HEAD - bool ParseOp(Local<Value> value, grpc_op *out) { - out->data.recv_initial_metadata = &recv_metadata; -======= bool ParseOp(Local<Value> value, grpc_op *out, shared_ptr<Resources> resources) { out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata; ->>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae return true; } bool IsFinalOp() { @@ -390,14 +385,8 @@ class ReadMessageOp : public Op { return scope.Escape(ByteBufferToBuffer(recv_message)); } -<<<<<<< HEAD bool ParseOp(Local<Value> value, grpc_op *out) { - out->data.recv_message = &recv_message; -======= - bool ParseOp(Local<Value> value, grpc_op *out, - shared_ptr<Resources> resources) { out->data.recv_message.recv_message = &recv_message; ->>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae return true; } bool IsFinalOp() { |