diff options
| author | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
| commit | f145a56e959fb3b2505dc9f3cf9b7be5ade53125 (patch) | |
| tree | e55bcddd3a0904c731e6126136d0862b84c28d2b /erts/doc/src/erlang.xml | |
| parent | 7228e3ea97f8e2a19be97740053892e67cc20baf (diff) | |
| parent | a54773f05cd60045a4ac0f9a4ae753aa76185b61 (diff) | |
| download | otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.gz otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.bz2 otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.zip | |
Merge branch 'sverker/remove-nif-reload/OTP-13908'
* sverker/remove-nif-reload:
erts: Cuddle nif_SUITE:consume_timeslice
erts: Remove old doc note for erlang:load_nif
erts: Remove deprecated nif 'reload' feature
erts: Fix trace_nif_SUITE to load nif lib only once
Diffstat (limited to 'erts/doc/src/erlang.xml')
| -rw-r--r-- | erts/doc/src/erlang.xml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index f42c39db5f..f318f28b6d 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -2562,13 +2562,6 @@ os_prompt%</pre> <name name="load_nif" arity="2"/> <fsummary>Load NIF library.</fsummary> <desc> - <note> - <p>Before Erlang/OTP R14B, NIFs were an - experimental feature. Versions before Erlang/OTP R14B can - have different and possibly incompatible NIF semantics and - interfaces. For example, in Erlang/OTP R13B03 the return value on - failure was <c>{error,Reason,Text}</c>.</p> - </note> <p>Loads and links a dynamic library containing native implemented functions (NIFs) for a module. <c><anno>Path</anno></c> is a file path to the shareable object/dynamic library file minus @@ -2598,9 +2591,13 @@ os_prompt%</pre> <item>The library did not fulfill the requirements as a NIF library of the calling module. </item> - <tag><c>load | reload | upgrade</c></tag> + <tag><c>load | upgrade</c></tag> <item>The corresponding library callback was unsuccessful. </item> + <tag><c>reload</c></tag> + <item>A NIF library is already loaded for this module instance. + The previously deprecated <c>reload</c> feature was removed in OTP 20. + </item> <tag><c>old_code</c></tag> <item>The call to <c>load_nif/2</c> was made from the old code of a module that has been upgraded; this is not |