diff options
| author | Mike Pall <mike> | 2021-09-24 12:11:55 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2021-09-24 12:11:55 +0200 |
| commit | cb0f124f8f8717eb235989f9c86168140fbf96fd (patch) | |
| tree | 9430de7542cc6cd68d0cd1561b0ee2a20eb423f7 /doc | |
| parent | 94a40bb238092e73f3dc0c3626911a7efa997c22 (diff) | |
| parent | 1811c4b0f18d4a6e4ebc0a305a564e9339a36d05 (diff) | |
| download | luajit-cb0f124f8f8717eb235989f9c86168140fbf96fd.tar.gz luajit-cb0f124f8f8717eb235989f9c86168140fbf96fd.tar.bz2 luajit-cb0f124f8f8717eb235989f9c86168140fbf96fd.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/extensions.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/extensions.html b/doc/extensions.html index 799679a3..748c1793 100644 --- a/doc/extensions.html +++ b/doc/extensions.html | |||
| @@ -427,7 +427,9 @@ the toolchain used to compile LuaJIT: | |||
| 427 | on the C stack. The contents of the C++ exception object | 427 | on the C stack. The contents of the C++ exception object |
| 428 | pass through unmodified.</li> | 428 | pass through unmodified.</li> |
| 429 | <li>Lua errors can be caught on the C++ side with <tt>catch(...)</tt>. | 429 | <li>Lua errors can be caught on the C++ side with <tt>catch(...)</tt>. |
| 430 | The corresponding Lua error message can be retrieved from the Lua stack.</li> | 430 | The corresponding Lua error message can be retrieved from the Lua stack.<br> |
| 431 | For MSVC for Windows 64 bit this requires compilation of your C++ code | ||
| 432 | with <tt>/EHa</tt>.</li> | ||
| 431 | <li>Throwing Lua errors across C++ frames is safe. C++ destructors | 433 | <li>Throwing Lua errors across C++ frames is safe. C++ destructors |
| 432 | will be called.</li> | 434 | will be called.</li> |
| 433 | </ul> | 435 | </ul> |