Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
b48861aa
Commit
b48861aa
authored
Jan 03, 2016
by
David Renshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
takeFromOtherAnswer -> takeFromOtherQuestion
parent
820eed43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
rpc.c++
c++/src/capnp/rpc.c++
+2
-2
rpc.capnp
c++/src/capnp/rpc.capnp
+1
-1
No files found.
c++/src/capnp/rpc.c++
View file @
b48861aa
...
...
@@ -2390,11 +2390,11 @@ private:
KJ_IF_MAYBE
(
response
,
answer
->
redirectedResults
)
{
questionRef
->
fulfill
(
kj
::
mv
(
*
response
));
}
else
{
KJ_FAIL_REQUIRE
(
"`Return.takeFromOther
Answer
` referenced a call that did not "
KJ_FAIL_REQUIRE
(
"`Return.takeFromOther
Question
` referenced a call that did not "
"use `sendResultsTo.yourself`."
)
{
return
;
}
}
}
else
{
KJ_FAIL_REQUIRE
(
"`Return.takeFromOther
Answer
` had invalid answer ID."
)
{
return
;
}
KJ_FAIL_REQUIRE
(
"`Return.takeFromOther
Question
` had invalid answer ID."
)
{
return
;
}
}
break
;
...
...
c++/src/capnp/rpc.capnp
View file @
b48861aa
...
...
@@ -431,7 +431,7 @@ struct Call {
# Don't actually return the results to the sender. Instead, hold on to them and await
# instructions from the sender regarding what to do with them. In particular, the sender
# may subsequently send a `Return` for some other call (which the receiver had previously made
# to the sender) with `takeFromOther
Answer
` set. The results from this call are then used
# to the sender) with `takeFromOther
Question
` set. The results from this call are then used
# as the results of the other call.
#
# When `yourself` is used, the receiver must still send a `Return` for the call, but sets the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment