diff options
author | Lukas Larsson <[email protected]> | 2016-12-20 14:44:18 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-12-20 14:44:18 +0100 |
commit | 9ffc782bd41a89b8f3f73bd698253812d30a8293 (patch) | |
tree | 0c64e1ed706888ac4b1b8b46b8d86ce34bf87777 /erts/preloaded/src/erlang.erl | |
parent | a4350201d204d61ee67b7330200c8d7d6d4b38d5 (diff) | |
parent | ca7e946af9c2fdc86c1c74259ee7b6881c5aec1e (diff) | |
download | otp-9ffc782bd41a89b8f3f73bd698253812d30a8293.tar.gz otp-9ffc782bd41a89b8f3f73bd698253812d30a8293.tar.bz2 otp-9ffc782bd41a89b8f3f73bd698253812d30a8293.zip |
Merge branch 'mikpe/erts/system_info-atom_table/PR-1286/OTP-13976'
* mikpe/erts/system_info-atom_table/PR-1286/OTP-13976:
erts: add erlang:system_info(atom_count)
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
-rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 15c3e01653..6ca0a4c160 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2532,6 +2532,7 @@ tuple_to_list(_Tuple) -> Alloc :: atom(); ({allocator_sizes, Alloc}) -> [_] when %% More or less anything Alloc :: atom(); + (atom_count) -> pos_integer(); (atom_limit) -> pos_integer(); (build_type) -> opt | debug | purify | quantify | purecov | gcov | valgrind | gprof | lcnt | frmptr; |