diff options
| author | Björn Gustavsson <[email protected]> | 2011-07-07 12:13:29 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-07-07 12:13:29 +0200 |
| commit | 98fa61aae86e4ea7311e8d281fcdc66e72ee8fa5 (patch) | |
| tree | 08e30f3e934faaff09eee20ae0c2c12e79d48b15 /lib/stdlib/src | |
| parent | 1072135987931e61d3b2722dad2fa3e807b7e4e7 (diff) | |
| parent | 7494e673e1402db8645fbeea2784bf7d908de5f9 (diff) | |
| download | otp-98fa61aae86e4ea7311e8d281fcdc66e72ee8fa5.tar.gz otp-98fa61aae86e4ea7311e8d281fcdc66e72ee8fa5.tar.bz2 otp-98fa61aae86e4ea7311e8d281fcdc66e72ee8fa5.zip | |
Merge branch 'bjorn/remove-concat-binary/OTP-9421' into major
* bjorn/remove-concat-binary/OTP-9421:
Update preloaded modules
Remove deprecated concat_binary/1
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/erl_internal.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index 478f05e792..0b9b8b8e17 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -263,7 +263,6 @@ bif(bit_size, 1) -> true; bif(bitstring_to_list, 1) -> true; bif(byte_size, 1) -> true; bif(check_process_code, 2) -> true; -bif(concat_binary, 1) -> true; bif(date, 0) -> true; bif(delete_module, 1) -> true; bif(demonitor, 1) -> true; @@ -405,7 +404,6 @@ old_bif(bit_size, 1) -> true; old_bif(bitstring_to_list, 1) -> true; old_bif(byte_size, 1) -> true; old_bif(check_process_code, 2) -> true; -old_bif(concat_binary, 1) -> true; old_bif(date, 0) -> true; old_bif(delete_module, 1) -> true; old_bif(disconnect_node, 1) -> true; diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 39d017d430..bbc4301446 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -449,7 +449,7 @@ obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 -> %% Added in R13B04. obsolete_1(erlang, concat_binary, 1) -> - {deprecated,{erlang,list_to_binary,1},"R15B"}; + {removed,{erlang,list_to_binary,1},"R15B"}; %% Added in R14A. obsolete_1(ssl, peercert, 2) -> |