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 /erts/preloaded | |
| 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 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 27016 -> 26772 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 8 |
2 files changed, 1 insertions, 7 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex cd44e8232c..f704135ce8 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 5deb69edab..ff3633a3cc 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -35,14 +35,13 @@ -export([delay_trap/2]). -export([set_cookie/2, get_cookie/0]). -export([nodes/0]). --export([concat_binary/1]). + -export([list_to_integer/2,integer_to_list/2]). -export([flush_monitor_message/2]). -export([set_cpu_topology/1, format_cpu_topology/1]). -export([await_proc_exit/3]). -deprecated([hash/2]). --deprecated([concat_binary/1]). % Get rid of autoimports of spawn to avoid clashes with ourselves. -compile({no_auto_import,[spawn/1]}). @@ -535,11 +534,6 @@ set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) -> get_cookie() -> auth:get_cookie(). --spec concat_binary(ListOfBinaries) -> binary() when - ListOfBinaries :: iolist(). -concat_binary(List) -> - list_to_binary(List). - -spec integer_to_list(Integer, Base) -> string() when Integer :: integer(), Base :: 2..36. |