Skip to content

MINOR: [R] switch on R_VERSION #43504

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

Merged
jonkeane merged 2 commits into from
Aug 1, 2024
Merged

MINOR: [R] switch on R_VERSION #43504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10fa511
ifdef does not work to detect function declarations
jonkeane Aug 1, 2024
8a082f5
Update r/src/arrow_cpp11.h
jonkeane Aug 1, 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
2 changes: 1 addition & 1 deletion r/src/arrow_cpp11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ SEXP to_r6(const std::shared_ptr<T>& ptr, const char* r6_class_name) {

// R_existsVarInFrame doesn't exist before R 4.2, so we need to fall back to
// Rf_findVarInFrame3 if it is not defined.
#ifdef R_existsVarInFrame
#if R_VERSION >= R_Version(4, 2, 0)
if (!R_existsVarInFrame(arrow::r::ns::arrow, r6_class)) {
cpp11::stop("No arrow R6 class named '%s'", r6_class_name);
}
Expand Down