Skip to content

Commit d303f9e

Browse files
drop support for user-defined databases (#1314)
Co-authored-by: Dirk Eddelbuettel <[email protected]>
1 parent 19328ad commit d303f9e

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
* src/barrier.cpp: Avoid using {STRING/VECTOR}_PTR
1717
* inst/include/Rcpp/r/compat.h: Include compatibility defines
1818

19+
2024-07-05 Kevin Ushey <[email protected]>
20+
21+
* inst/include/Rcpp/Environment.h: Drop support for UserDefinedDatabase
22+
[ merged 2024-07-22 after release of Rcpp 1.0.13 ]
23+
1924
2024-06-22 Dirk Eddelbuettel <[email protected]>
2025

2126
* DESCRIPTION (Version, Date): Roll micro version

inst/include/Rcpp/Environment.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@ namespace Rcpp{
8484
*/
8585
SEXP ls(bool all) const {
8686
SEXP env = Storage::get__() ;
87-
if( is_user_database() ){
88-
R_ObjectTable *tb = (R_ObjectTable*) R_ExternalPtrAddr(HASHTAB(env));
89-
return tb->objects(tb) ;
90-
} else {
91-
return R_lsInternal( env, all ? TRUE : FALSE ) ;
92-
}
87+
return R_lsInternal( env, all ? TRUE : FALSE ) ;
9388
return R_NilValue ;
9489
}
9590

@@ -318,14 +313,6 @@ namespace Rcpp{
318313
return R_BindingIsActive(nameSym, Storage::get__()) ;
319314
}
320315

321-
/**
322-
* Indicates if this is a user defined database.
323-
*/
324-
bool is_user_database() const {
325-
SEXP env = Storage::get__() ;
326-
return OBJECT(env) && Rf_inherits(env, "UserDefinedDatabase") ;
327-
}
328-
329316
/**
330317
* @return the global environment. See ?globalenv
331318
*/

0 commit comments

Comments
 (0)