diff options
| author | Patrik Nyblom <[email protected]> | 2011-06-21 12:18:15 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-06-21 12:18:15 +0200 |
| commit | b781506f927672fe22c3fba20e25d39ee64c9594 (patch) | |
| tree | cba3158ffd2f41e6493342d884382bfb2eaa672e /lib/kernel/src/rpc.erl | |
| parent | 22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342 (diff) | |
| parent | b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1 (diff) | |
| download | otp-b781506f927672fe22c3fba20e25d39ee64c9594.tar.gz otp-b781506f927672fe22c3fba20e25d39ee64c9594.tar.bz2 otp-b781506f927672fe22c3fba20e25d39ee64c9594.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/kernel/src/rpc.erl')
| -rw-r--r-- | lib/kernel/src/rpc.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl index be35f99ed2..e214ffa404 100644 --- a/lib/kernel/src/rpc.erl +++ b/lib/kernel/src/rpc.erl @@ -662,9 +662,10 @@ async_call(Node, Mod, Fun, Args) -> ReplyTo ! {self(), {promise_reply, R}} %% self() is key end). --spec yield(Key) -> {value, Val} | timeout when +-spec yield(Key) -> Res | {badrpc, Reason} when Key :: key(), - Val :: (Res :: term()) | {badrpc, Reason :: term()}. + Res :: term(), + Reason :: term(). yield(Key) when is_pid(Key) -> {value,R} = do_yield(Key, infinity), |