diff --git a/ChangeLog b/ChangeLog index 5ff542cb5..f7e84b90a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2025-03-07 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version and date + + * inst/include/Rcpp/config.h: Idem + + * src/barrier.cpp (dataptr): Replace remaining DATAPTR with + DATAPTR_RO for suitable R greater than 3.5.0 + 2025-02-11 Dirk Eddelbuettel * R/Rcpp.package.skeleton.R (Rcpp.package.skeleton): Support optional diff --git a/DESCRIPTION b/DESCRIPTION index 87996386c..87d822fa4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.0.14.3 -Date: 2025-02-11 +Version: 1.0.14.4 +Date: 2025-03-07 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h index 0410a92cf..fd69accda 100644 --- a/inst/include/Rcpp/config.h +++ b/inst/include/Rcpp/config.h @@ -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,3) -#define RCPP_DEV_VERSION_STRING "1.0.14.3" +#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,4) +#define RCPP_DEV_VERSION_STRING "1.0.14.4" #endif diff --git a/src/barrier.cpp b/src/barrier.cpp index c4e417920..e3ac21a6a 100644 --- a/src/barrier.cpp +++ b/src/barrier.cpp @@ -76,7 +76,13 @@ SEXP* get_vector_ptr(SEXP x) { // [[Rcpp::register]] void* dataptr(SEXP x) { +#if R_VERSION >= R_Version(3,5,0) + // DATAPTR_RO was introduced with R 3.5.0 + return const_cast(DATAPTR_RO(x)); +#else + // this will get your wrists slapped under recent R CMD check ... return DATAPTR(x); +#endif } // [[Rcpp::register]]