diff options
| author | Lukas Larsson <[email protected]> | 2013-06-05 16:04:38 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-06-05 16:04:38 +0200 |
| commit | a617d1665e33c2a622fe1f426566a40cd2c6556e (patch) | |
| tree | 3914ba0e3fb2e7743531705a30af9521968d516f /erts | |
| parent | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (diff) | |
| parent | 5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628 (diff) | |
| download | otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.tar.gz otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.tar.bz2 otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.zip | |
Merge branch 'maint'
* maint:
erts: Update spec in preloaded to reflect sucess typing
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 94164 -> 94144 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 4 |
2 files changed, 1 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 5a0bb637cc..1e434bfbba 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 4fab04322f..1efed5764c 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3554,9 +3554,7 @@ sched_wall_time(Ref, N, Acc) -> {Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc]) end. --spec erlang:gather_gc_info_result(Ref) -> [{pos_integer(), - pos_integer(), - 0}] when +-spec erlang:gather_gc_info_result(Ref) -> [{number(),number(),0}] when Ref :: reference(). gather_gc_info_result(Ref) when erlang:is_reference(Ref) -> |