Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conditionally define R_NO_REMAP and STRICT_R_HEADERS #410

Merged
merged 3 commits into from
Dec 3, 2024
Merged

Conditionally define R_NO_REMAP and STRICT_R_HEADERS #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d32f6d8
Conditionally define `R_NO_REMAP` and `STRICT_R_HEADERS`
DavisVaughan Dec 3, 2024
fc80872
NEWS bullet
DavisVaughan Dec 3, 2024
aafeac5
Fill in number
DavisVaughan Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# cpp11 (development version)

* `R_NO_REMAP` and `STRICT_R_HEADERS` are now conditionally defined only if they
have not already been defined elsewhere. This is motivated by the fact that
`R_NO_REMAP` is becoming the default for C++ code in R 4.5.0 (#410).

* Because cpp11 now requires R >=4.0.0 and `R_UnwindProtect()` is always
available, `HAS_UNWIND_PROTECT` is no longer useful. Please avoid using it,
as we'd like to remove it in the future (#411).
Expand Down
6 changes: 6 additions & 0 deletions inst/include/cpp11/R.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@
#endif
#endif

#ifndef R_NO_REMAP
#define R_NO_REMAP
#endif

#ifndef STRICT_R_HEADERS
#define STRICT_R_HEADERS
#endif

#include "R_ext/Boolean.h"
#include "Rinternals.h"
#include "Rversion.h"
Expand Down