aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-06-10 10:00:18 +0200
committerLukas Larsson <[email protected]>2013-06-10 10:00:18 +0200
commit5c956596526b0d996319786c808a0799dd0d61eb (patch)
treefa9df3d7e2ed2199f1220ab1f834f4b3d3e710d8
parent867e19e98095275ee4d3e102de269f60c52fdb45 (diff)
parentbb399e7ab2d96edcaa0ff482bd51494848c1a248 (diff)
downloadotp-5c956596526b0d996319786c808a0799dd0d61eb.tar.gz
otp-5c956596526b0d996319786c808a0799dd0d61eb.tar.bz2
otp-5c956596526b0d996319786c808a0799dd0d61eb.zip
Merge branch 'maint'
* maint: erts: Update spec in preloaded to reflect success typing (again) Conflicts: erts/preloaded/ebin/erlang.beam
-rw-r--r--erts/preloaded/ebin/erlang.beambin94144 -> 94140 bytes
-rw-r--r--erts/preloaded/src/erlang.erl4
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 1e434bfbba..db41a9d2e1 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 1efed5764c..833f0440ea 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -3554,8 +3554,8 @@ sched_wall_time(Ref, N, Acc) ->
{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
end.
--spec erlang:gather_gc_info_result(Ref) -> [{number(),number(),0}] when
- Ref :: reference().
+-spec erlang:gather_gc_info_result(Ref) ->
+ {number(),number(),0} when Ref :: reference().
gather_gc_info_result(Ref) when erlang:is_reference(Ref) ->
gc_info(Ref, erlang:system_info(schedulers), {0,0}).