grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
Craig Tiller 2017-01-26 13:16:37 -08:00
parent 1e4f7652ce
commit a33333391a
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/call.cc
View File

@ -352,14 +352,9 @@ class GetMetadataOp : public Op {
return scope.Escape(ParseMetadata(&recv_metadata)); 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, bool ParseOp(Local<Value> value, grpc_op *out,
shared_ptr<Resources> resources) { shared_ptr<Resources> resources) {
out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata; out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata;
>>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae
return true; return true;
} }
bool IsFinalOp() { bool IsFinalOp() {
@ -390,14 +385,8 @@ class ReadMessageOp : public Op {
return scope.Escape(ByteBufferToBuffer(recv_message)); return scope.Escape(ByteBufferToBuffer(recv_message));
} }
<<<<<<< HEAD
bool ParseOp(Local<Value> value, grpc_op *out) { 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; out->data.recv_message.recv_message = &recv_message;
>>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae
return true; return true;
} }
bool IsFinalOp() { bool IsFinalOp() {