diff options
| author | Rickard Green <[email protected]> | 2017-01-25 15:13:30 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-25 15:13:30 +0100 |
| commit | 7ac0749866500a4de95a00492df31127df78c2be (patch) | |
| tree | 9f65771d3af287eaef101cd86153478af46c67ab /erts/doc/src | |
| parent | 407ed6d3b1f9747b854b2a7ee0cf50bc689ebb8c (diff) | |
| parent | eaecd838ebc3410efcbe0f3b1717543d6a4650b0 (diff) | |
| download | otp-7ac0749866500a4de95a00492df31127df78c2be.tar.gz otp-7ac0749866500a4de95a00492df31127df78c2be.tar.bz2 otp-7ac0749866500a4de95a00492df31127df78c2be.zip | |
Merge branch 'rickard/ds-20-fix'
* rickard/ds-20-fix:
Fix unused warning
Change exception for enif_schedule_nif() with dirty flags
Remove double check of NifExport when checking process code
Diffstat (limited to 'erts/doc/src')
| -rw-r--r-- | erts/doc/src/erl_nif.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index 51b095e6ef..74a551d60b 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -2463,7 +2463,7 @@ enif_map_iterator_destroy(env, &iter);</code> CPU-bound, or <c>ERL_NIF_DIRTY_JOB_IO_BOUND</c> for jobs that will be I/O-bound. If dirty scheduler threads are not available in the emulator, an attempt to schedule such a job - results in a <c>badarg</c> exception.</p> + results in a <c>notsup</c> exception.</p> </item> <tag><c>argc</c> and <c>argv</c></tag> <item> |