Skip to content

Use lsInteral3 instead of lsInternal #1362

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 2 commits into from
Mar 16, 2025
Merged

Use lsInteral3 instead of lsInternal #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6449ed8
Per CCed email from Vienna: use lsInteral3 instead of lsInternal
eddelbuettel Mar 13, 2025
90eb156
Roll micro version and date (chiefly to have a rev.dep tag)
eddelbuettel Mar 13, 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
8 changes: 8 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2025-03-13 Dirk Eddelbuettel <[email protected]>

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

* inst/include/Rcpp/Environment.h: Switch from R_lsInternal to
R_lsInternal3 as the former is now outlawed

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

* DESCRIPTION (Version, Date): Roll micro version and date
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.5
Date: 2025-03-10
Version: 1.0.14.6
Date: 2025-03-13
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
2 changes: 1 addition & 1 deletion inst/include/Rcpp/Environment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Rcpp{
*/
SEXP ls(bool all) const {
SEXP env = Storage::get__() ;
return R_lsInternal( env, all ? TRUE : FALSE ) ;
return R_lsInternal3(env, all ? TRUE : FALSE, TRUE);
return R_NilValue ;
}

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,5)
#define RCPP_DEV_VERSION_STRING "1.0.14.5"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,14,6)
#define RCPP_DEV_VERSION_STRING "1.0.14.6"

#endif