diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:47:49 +0200 |
| commit | fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82 (patch) | |
| tree | 7238e0341da395b7b1ea45788697de764bdbc009 /erts/emulator/beam/bif.tab | |
| parent | cb252aecf7da924e2959dadd390f1bbd320b2eb8 (diff) | |
| parent | 82c048745efcb5d811ec0489858b821ef39ea387 (diff) | |
| download | otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.gz otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.tar.bz2 otp-fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82.zip | |
Merge branch 'rickard/binary_to_term_error/OTP-11931' into maint
* rickard/binary_to_term_error/OTP-11931:
Replace erlang:binary_to_term() Erlang wrappers
Conflicts:
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index fbdddf09db..011e49f1fe 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -45,6 +45,7 @@ bif erlang:apply/3 bif erlang:atom_to_list/1 bif erlang:binary_to_list/1 bif erlang:binary_to_list/3 +bif erlang:binary_to_term/1 bif erlang:crc32/1 bif erlang:crc32/2 bif erlang:crc32_combine/3 @@ -151,8 +152,6 @@ bif erts_internal:port_command/3 bif erts_internal:port_control/3 bif erts_internal:port_close/1 bif erts_internal:port_connect/2 -bif erts_internal:binary_to_term/1 -bif erts_internal:binary_to_term/2 bif erts_internal:request_system_task/3 bif erts_internal:check_process_code/2 @@ -481,6 +480,11 @@ bif erlang:call_on_load_function/1 bif erlang:finish_after_on_load/2 # +# New Bifs in R13B04 +# +bif erlang:binary_to_term/2 + +# # The binary match bifs (New in R14A - EEP9) # |