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.

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

Protect another R_NO_REMAP with preceding #ifndef #1353

Merged
merged 1 commit into from
Jan 1, 2025

Conversation

eddelbuettel
Copy link
Member

I noticed a second #define R_NO_REMAP in the (very much optional) file Benchmark/Timer.h so adding a now-required preceding #ifndef / #endif around it as R 4.5.0 now defines R_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

  • Code compiles correctly
  • R CMD check still passes all tests
  • Preferably, new tests were added which fail without the change
  • Document the changes by file in ChangeLog

Copy link
Member

@Enchufa2 Enchufa2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@eddelbuettel eddelbuettel merged commit 52839b0 into master Jan 1, 2025
18 checks passed
@eddelbuettel eddelbuettel deleted the feature/ifndef_no_remap branch January 1, 2025 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants