Skip to content

drop support for user-defined databases #1314

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
Jul 22, 2024
Merged

drop support for user-defined databases #1314

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
ccfdc2e
drop support for user-defined databases
kevinushey Jul 5, 2024
f084a6a
Merge branch 'master' into bugfix/user-defined-database-drop-support
eddelbuettel Jul 22, 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
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
* src/barrier.cpp: Avoid using {STRING/VECTOR}_PTR
* inst/include/Rcpp/r/compat.h: Include compatibility defines

2024-07-05 Kevin Ushey <kevinushey@gmail.com>

* inst/include/Rcpp/Environment.h: Drop support for UserDefinedDatabase
[ merged 2024-07-22 after release of Rcpp 1.0.13 ]

2024-06-22 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro version
Expand Down
15 changes: 1 addition & 14 deletions inst/include/Rcpp/Environment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,7 @@ namespace Rcpp{
*/
SEXP ls(bool all) const {
SEXP env = Storage::get__() ;
if( is_user_database() ){
R_ObjectTable *tb = (R_ObjectTable*) R_ExternalPtrAddr(HASHTAB(env));
return tb->objects(tb) ;
} else {
return R_lsInternal( env, all ? TRUE : FALSE ) ;
}
return R_lsInternal( env, all ? TRUE : FALSE ) ;
return R_NilValue ;
}

Expand Down Expand Up @@ -318,14 +313,6 @@ namespace Rcpp{
return R_BindingIsActive(nameSym, Storage::get__()) ;
}

/**
* Indicates if this is a user defined database.
*/
bool is_user_database() const {
SEXP env = Storage::get__() ;
return OBJECT(env) && Rf_inherits(env, "UserDefinedDatabase") ;
}

/**
* @return the global environment. See ?globalenv
*/
Expand Down