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

Version-guard STRING_PTR definition #6654

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Version-guard STRING_PTR definition #6654

merged 1 commit into from
Dec 10, 2024

Conversation

MichaelChirico
Copy link
Member

Part of #6180. I'm not quite sure why the #ifndef approach failed us, but I confirmed this works, as well as confirming R 3.5.0 is the first version where STRING_PTR_RO() is in a release:

https://github.com/wch/r-source/blob/tags/R-3-4-4/src/include/Rinternals.h
https://github.com/wch/r-source/blob/tags/R-3-5-0/src/include/Rinternals.h

Copy link

codecov bot commented Dec 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.61%. Comparing base (436bd6c) to head (1c6ff24).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6654   +/-   ##
=======================================
  Coverage   98.61%   98.61%           
=======================================
  Files          79       79           
  Lines       14558    14558           
=======================================
  Hits        14357    14357           
  Misses        201      201           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

Comparison Plot

Generated via commit 1c6ff24

Download link for the artifact containing the test results: ↓ atime-results.zip

Task Duration
R setup and installing dependencies 4 minutes and 50 seconds
Installing different package versions 7 minutes and 37 seconds
Running and plotting the test cases 2 minutes and 14 seconds

@aitap
Copy link
Contributor

aitap commented Dec 10, 2024

Good catch! STRING_PTR_RO used to be available as a macro with USE_RINTERNALS defined, otherwise as the exported function-wrapper with slightly better safety. Most of USE_RINTERNALS disappeared in R-4.2.0.

@MichaelChirico
Copy link
Member Author

Ah, well that makes sense! #ifndef doesn't work because simply it's not a macro! 🤪

@MichaelChirico MichaelChirico merged commit dc7fb4d into master Dec 10, 2024
11 checks passed
@MichaelChirico MichaelChirico deleted the string-ptr-ro branch December 10, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants