Commit ae5fe8f
committed
Revert changes to modules related to BEGIN/END macros
It appears as if moving the BEGIN/END handling out to the highest level of the modules code allowed exceptiosn to propagate across the boundary between user DLLs and the Rcpp DLL, thus causing a crash on Windows.
This changes reverts all of the modules related changes to BEGIN/END handling, essentially leaving them exactly as they were (and allowing our tests to continue passing).
AFAIK we need to either do this or need to rework the modules code so that the exceptions no longer propagate (I don't think just surpressing the test on Windows is an option as this represents a change in behavior which may crash packages currently on CRAN).1 parent ff3b8ef commit ae5fe8f
File tree
5 files changed
+566
-159
lines changed- inst/include/Rcpp
- api/meat/module
- module
- src
5 files changed
+566
-159
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
| 44 | + | |
43 | 45 | | |
44 | 46 | | |
45 | 47 | | |
| |||
53 | 55 | | |
54 | 56 | | |
55 | 57 | | |
| 58 | + | |
56 | 59 | | |
57 | | - | |
| 60 | + | |
58 | 61 | | |
59 | 62 | | |
60 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
0 commit comments