From d303f9e1610b116ecab2a36762ce4aaea9693889 Mon Sep 17 00:00:00 2001 From: Kevin Ushey Date: Tue, 23 Jul 2024 06:06:13 +0800 Subject: [PATCH] drop support for user-defined databases (#1314) Co-authored-by: Dirk Eddelbuettel --- ChangeLog | 5 +++++ inst/include/Rcpp/Environment.h | 15 +-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a7c7bd3e..e780ff7aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 + + * 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 * DESCRIPTION (Version, Date): Roll micro version diff --git a/inst/include/Rcpp/Environment.h b/inst/include/Rcpp/Environment.h index fdd33c330..76779f2fb 100644 --- a/inst/include/Rcpp/Environment.h +++ b/inst/include/Rcpp/Environment.h @@ -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 ; } @@ -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 */