aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-06-05 15:58:47 +0200
committerLukas Larsson <[email protected]>2013-06-05 16:01:14 +0200
commit5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628 (patch)
treecb411e46d3d909a22ac658bc15250e65dbcb6332
parentc6fe4731a9093166ff41d16900d22808b5a68053 (diff)
parentad37c5a300f2711baa32e2f5b6697191dd8bfc67 (diff)
downloadotp-5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628.tar.gz
otp-5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628.tar.bz2
otp-5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628.zip
Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maint
* lukas/erts/gc_stat_contention/OTP-10271: erts: Update spec in preloaded to reflect sucess typing
-rw-r--r--erts/preloaded/ebin/erlang.beambin94140 -> 94128 bytes
-rw-r--r--erts/preloaded/src/erlang.erl4
2 files changed, 1 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 947fbe7c24..d977b237be 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 a93194d0bc..34785ff2a9 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) ->