diff options
| author | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
| commit | c8825f09f5df654ab89d417af827bfaa7f185066 (patch) | |
| tree | d9255a7a58e01421f3571f4cd9074b557e8d3567 /erts/preloaded | |
| parent | d395b5c5559a18e44258ca46e4b8703189d18067 (diff) | |
| parent | ea84ab6c03994f8d6d9f07d8740f0547f8a3cb51 (diff) | |
| download | otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.gz otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.bz2 otp-c8825f09f5df654ab89d417af827bfaa7f185066.zip | |
Merge branch 'rickard/timer-improvement/OTP-12650'
* rickard/timer-improvement/OTP-12650:
Callback timer
Disable accessor timer option
Aux work flag descriptions
Fix test cases
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 101808 -> 101808 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex c0fca6aafa..b99dc7339a 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index ea8a911a2c..9d9208d1b5 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1557,7 +1557,7 @@ send_after(_Time, _Dest, _Msg) -> Msg :: term(), Options :: [Option], Abs :: boolean(), - Option :: {abs, Abs}, %% | {accessor, Accessor} undocumented feature for now, + Option :: {abs, Abs}, TimerRef :: reference(). send_after(_Time, _Dest, _Msg, _Options) -> @@ -1645,7 +1645,7 @@ start_timer(_Time, _Dest, _Msg) -> Msg :: term(), Options :: [Option], Abs :: boolean(), - Option :: {abs, Abs}, %% | {accessor, Accessor} undocumented feature for now, + Option :: {abs, Abs}, TimerRef :: reference(). start_timer(_Time, _Dest, _Msg, _Options) -> |