Skip to content

Replace use of deprecated CLOENV with R_ClosureEnv if R >= 4.5.0 (closes #1360) #1361

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
merged 3 commits into from
Mar 12, 2025
Merged

Replace use of deprecated CLOENV with R_ClosureEnv if R >= 4.5.0 (closes #1360) #1361

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
03db1f7
Use R_ClosureEnv instead of CLOENV with R (>= 4.5.0)
eddelbuettel Mar 8, 2025
a92d69e
Roll micro version and date, update NEWS.Rd
eddelbuettel Mar 10, 2025
36ee0bf
Microcorrection to PR number in NEWS.Rd [ci skip]
eddelbuettel Mar 10, 2025
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
13 changes: 10 additions & 3 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
2025-03-07 Dirk Eddelbuettel <[email protected]>
2025-03-10 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date
* inst/include/Rcpp/config.h: Idem

2025-03-08 Dirk Eddelbuettel <[email protected]>

* inst/include/Rcpp/Function.h: Use R_ClosureEnv instead of
deprecated CLOENV if under R >= 4.5.0

2025-03-07 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date
* inst/include/Rcpp/config.h: Idem

* src/barrier.cpp (dataptr): Replace remaining DATAPTR with
Expand All @@ -21,7 +30,6 @@
2025-02-05 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date

* inst/include/Rcpp/config.h: Idem

2025-01-31 Lev Kandel <[email protected]>
Expand All @@ -36,7 +44,6 @@
2025-01-26 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date

* inst/include/Rcpp/config.h: Idem

2025-01-25 Dirk Eddelbuettel <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.14.4
Date: 2025-03-07
Version: 1.0.14.5
Date: 2025-03-10
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
comment = c(ORCID = "0000-0001-6419-907X")),
person("Romain", "Francois", role = "aut",
Expand Down
4 changes: 4 additions & 0 deletions inst/NEWS.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
\itemize{
\item The \code{std::string_view} type is now covered by \code{wrap()}
(Lev Kandel in \ghpr{1356} as discussed in \ghit{1357})
\item A last remaining \code{DATAPTR} use has been converted to
\code{DATAPTR_RO} (Dirk in \ghpr{1359})
\item Under R 4.5.0 or later, \code{R_ClosureEnv} is used instead of
\code{CLOENV} (Dirk in \ghpr{1361} fixing \ghpr{1360})
}
\item Changes in Rcpp Documentation:
\itemize{
Expand Down
6 changes: 5 additions & 1 deletion inst/include/Rcpp/Function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ namespace Rcpp{
if( TYPEOF(fun) != CLOSXP ) {
throw not_a_closure(Rf_type2char(TYPEOF(fun)));
}
return CLOENV(fun) ;
#if (defined(R_VERSION) && R_VERSION >= R_Version(4,5,0))
return R_ClosureEnv(fun);
#else
return CLOENV(fun);
#endif
}

/**
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/Symbol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace Rcpp{
Storage::set__( x ) ;
break; /* nothing to do */
case CHARSXP: {
#if R_VERSION >= R_Version(3,2,0)
#if R_VERSION >= R_Version(3,2,0)
SEXP charSym = Rf_installChar(x); // R 3.2.0 or later have Rf_installChar
#else
SEXP charSym = Rf_install(CHAR(x)); // cannot be gc()'ed once in symbol table
Expand All @@ -53,7 +53,7 @@ namespace Rcpp{
}
case STRSXP: {
/* FIXME: check that there is at least one element */
#if R_VERSION >= R_Version(3,2,0)
#if R_VERSION >= R_Version(3,2,0)
SEXP charSym = Rf_installChar(STRING_ELT(x, 0 )); // R 3.2.0 or later have Rf_installChar
#else
SEXP charSym = Rf_install( CHAR(STRING_ELT(x, 0 )) ); // cannot be gc()'ed once in symbol table
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.14"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,4)
#define RCPP_DEV_VERSION_STRING "1.0.14.4"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,5)
#define RCPP_DEV_VERSION_STRING "1.0.14.5"

#endif