diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-02 10:28:36 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-02 10:28:36 +0200 |
| commit | ce148d0dc69797091a998ed73cf0a3dd6df83ec9 (patch) | |
| tree | 4ffbd1ec55d8a60fb6a80c0ce52c81bcd5c3622a /lib/stdlib | |
| parent | 025e5799c3204fbacb59340e752f9a72f75363bd (diff) | |
| parent | 9f1e455017228e8f35d82e2fe1e3c5268c2e0aa3 (diff) | |
| download | otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.gz otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.tar.bz2 otp-ce148d0dc69797091a998ed73cf0a3dd6df83ec9.zip | |
Merge branch 'dev' into major
* dev:
Make the check_old_code/1 BIF auto-imported
Deprecate the docbuilder application
Conflicts:
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/erl_internal.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index 0b9b8b8e17..cd3b531d10 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -262,6 +262,7 @@ bif(bitsize, 1) -> true; bif(bit_size, 1) -> true; bif(bitstring_to_list, 1) -> true; bif(byte_size, 1) -> true; +bif(check_old_code, 1) -> true; bif(check_process_code, 2) -> true; bif(date, 0) -> true; bif(delete_module, 1) -> true; diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index db46670f61..175514f92d 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -461,6 +461,14 @@ obsolete_1(public_key, pem_to_der, 1) -> obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 -> {deprecated,{public_key,pem_entry_decode,1},"R15A"}; +%% Added in R14B03. +obsolete_1(docb_gen, _, _) -> + {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"}; +obsolete_1(docb_transform, _, _) -> + {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"}; +obsolete_1(docb_xml_check, _, _) -> + {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"}; + %% Added in R15B obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver -> {deprecated,"deprecated (will be removed in R16A); has no effect as drivers are no longer used."}; |