diff options
author | Björn-Egil Dahlberg <[email protected]> | 2014-09-09 14:42:33 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2014-09-09 14:42:33 +0200 |
commit | e3590a3f87f02022eb6e608ae5c3fc93bcd025d0 (patch) | |
tree | aa06ccfe946f277729add7ac4227fd9184823805 /lib/stdlib/src | |
parent | 88c54fc500096d326a87414af1e936890655024f (diff) | |
parent | 6ec6493dcca2724493700e7d269d2984efe30b38 (diff) | |
download | otp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.tar.gz otp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.tar.bz2 otp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.zip |
Merge branch 'egil/erlang-get_keys/OTP-12151'
* egil/erlang-get_keys/OTP-12151:
Update preloaded erlang.beam
erts: Document erlang:get_keys/0
stdlib: Auto-import erlang:get_keys/0
erts: Add spec for erlang:get_keys/0
kernel: Test BIF erlang:get_keys/0
erts: Add BIF erlang:get_keys/0
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r-- | lib/stdlib/src/erl_internal.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index e523b6b476..2bf8b86c23 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -295,6 +295,7 @@ bif(garbage_collect, 1) -> true; bif(garbage_collect, 2) -> true; bif(get, 0) -> true; bif(get, 1) -> true; +bif(get_keys, 0) -> true; bif(get_keys, 1) -> true; bif(group_leader, 0) -> true; bif(group_leader, 2) -> true; |