drop support for user-defined databases (#1314)

Co-authored-by: Dirk Eddelbuettel <edd@debian.org>
RcppCore · Jul 22, 2024 · d303f9e · d303f9e
1 parent 19328ad
commit d303f9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git 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  <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

diff --git 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
          */