diff options
author | Björn-Egil Dahlberg <[email protected]> | 2016-04-28 12:11:14 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-28 12:11:14 +0200 |
commit | ac2f1c71d5b5169d49a5cd5fd73d28a702a58024 (patch) | |
tree | b7d5a1fd173ac55e252c37e1da33826e479dab36 /erts/emulator/beam/bif.tab | |
parent | 85ccc38d59dd9751dfd7cead0e4ed0c1e6c169ad (diff) | |
parent | eeac08ca0ed6358a87f265f87a62bea8d0feb3b1 (diff) | |
download | otp-ac2f1c71d5b5169d49a5cd5fd73d28a702a58024.tar.gz otp-ac2f1c71d5b5169d49a5cd5fd73d28a702a58024.tar.bz2 otp-ac2f1c71d5b5169d49a5cd5fd73d28a702a58024.zip |
Merge branch 'egil/maps-api-additions/PR-1025/OTP-13522'
* egil/maps-api-additions/PR-1025/OTP-13522:
stdlib: Document maps:update_with/3,4
stdlib: Add tests for maps:update_with/3,4
stdlib: Add maps:update_with/3,4
erts: Add tests for maps:take/2
stdlib: Document maps:take/2
erts: Add BIF maps:take/2
Diffstat (limited to 'erts/emulator/beam/bif.tab')
-rw-r--r-- | erts/emulator/beam/bif.tab | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 58cd31cee9..872f0f9b2a 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -652,6 +652,8 @@ bif erts_debug:size_shared/1 bif erts_debug:copy_shared/1 bif erlang:has_prepared_code_on_load/1 +bif maps:take/2 + # # Obsolete # |