Protect another R_NO_REMAP with preceding #ifndef #1353
Merged
+10
−5
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed a second
#define R_NO_REMAP
in the (very much optional) fileBenchmark/Timer.h
so adding a now-required preceding#ifndef / #endif
around it as R 4.5.0 now definesR_NO_REMAP
for C++ -- just like we have done since 2009 (!!).There was an earlier PR #1296 where I protected the main #define, but missed this.
Checklist
R CMD check
still passes all tests