aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-06-02 13:15:16 +0000
committerErlang/OTP <[email protected]>2010-06-02 13:15:16 +0000
commita2b84aa66d96ac3f808ca60d2de072992fdb1410 (patch)
tree449a23f20a4c0c263b9eee2329d4b9a9951ee904 /lib
parent841de5287ecef4dae5ea2e78531d8216f9b87989 (diff)
parenta62abc91b5f95fc9137d42867e1429867a77bf4e (diff)
downloadotp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.tar.gz
otp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.tar.bz2
otp-a2b84aa66d96ac3f808ca60d2de072992fdb1410.zip
Merge branch 'jv/autoimport-binary_to_term_2' into dev
* jv/autoimport-binary_to_term_2: Change binary_to_term/2 to be auto-imported OTP-8671 jv/autoimport-binary_to_term_2 Now, binary_to_term/2 is auto-imported. This will cause a compile warning if and only if a module has got a local function with that name.
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/erl_internal.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 2471c545dd..f78d8dc609 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -238,6 +238,7 @@ bif(binary_to_existing_atom, 2) -> true;
bif(binary_to_list, 1) -> true;
bif(binary_to_list, 3) -> true;
bif(binary_to_term, 1) -> true;
+bif(binary_to_term, 2) -> true;
bif(bitsize, 1) -> true;
bif(bit_size, 1) -> true;
bif(bitstring_to_list, 1) -> true;