diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:48:32 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:48:32 +0200 |
| commit | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (patch) | |
| tree | f32ea9f4a0a235707ce59fbbd76467d1ae1f59a0 /erts/preloaded | |
| parent | fd9ded54a9d1d3c1df3c44c0f5eed0be25f85a82 (diff) | |
| parent | d23496206b4892dae0efd053104d16904d1d8eab (diff) | |
| download | otp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.tar.gz otp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.tar.bz2 otp-8b4659d5246166cef9b8e9aa91c644e3b3ec66d5.zip | |
Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maint
* rickard/invalid_bitstr_bifs/OTP-11942:
Remove invalid 'bitstr' exports in erlang.erl
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 97940 -> 97732 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 16 |
2 files changed, 2 insertions, 14 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 531c561d52..fdc7401475 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index f669dafccd..4ff0513321 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -79,7 +79,7 @@ -export([binary_to_integer/1,binary_to_integer/2]). -export([binary_to_list/1]). -export([binary_to_list/3, binary_to_term/1, binary_to_term/2]). --export([bit_size/1, bitsize/1, bitstr_to_list/1, bitstring_to_list/1]). +-export([bit_size/1, bitsize/1, bitstring_to_list/1]). -export([bump_reductions/1, byte_size/1, call_on_load_function/1]). -export([cancel_timer/1, check_old_code/1, check_process_code/2, check_process_code/3, crc32/1]). @@ -100,7 +100,7 @@ -export([integer_to_binary/1, integer_to_list/1]). -export([iolist_size/1, iolist_to_binary/1]). -export([is_alive/0, is_builtin/3, is_process_alive/1, length/1, link/1]). --export([list_to_atom/1, list_to_binary/1, list_to_bitstr/1]). +-export([list_to_atom/1, list_to_binary/1]). -export([list_to_bitstring/1, list_to_existing_atom/1, list_to_float/1]). -export([list_to_integer/1, list_to_integer/2]). -export([list_to_pid/1, list_to_tuple/1, loaded/0]). @@ -384,12 +384,6 @@ bit_size(_Bitstring) -> bitsize(_P1) -> erlang:nif_error(undefined). -%% bitstr_to_list/1 --spec erlang:bitstr_to_list(P1) -> [byte() | bitstring()] when - P1 :: bitstring(). -bitstr_to_list(_P1) -> - erlang:nif_error(undefined). - %% bitstring_to_list/1 -spec bitstring_to_list(Bitstring) -> [byte() | bitstring()] when Bitstring :: bitstring(). @@ -1072,12 +1066,6 @@ list_to_atom(_String) -> list_to_binary(_IoList) -> erlang:nif_error(undefined). -%% list_to_bitstr/1 --spec erlang:list_to_bitstr(P1) -> bitstring() when - P1 :: bitstring_list(). -list_to_bitstr(_P1) -> - erlang:nif_error(undefined). - %% list_to_bitstring/1 -spec list_to_bitstring(BitstringList) -> bitstring() when BitstringList :: bitstring_list(). |