Merge pull request #8 from eddelbuettel/master

Switch error() to Rf_error() to accommodate R-devel
hanase · Jan 10, 2025 · 7a6c5b8 · 7a6c5b8
2 parents 50d0a75 + f9fcd9a
commit 7a6c5b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/R/iBMA.glm.R b/R/iBMA.glm.R
@@ -22,13 +22,14 @@ https://github.com/SurajGupta/r-source/blob/master/src/main/envir.c
 #define FRAME_LOCK_MASK (1<<14)
 #define FRAME_IS_LOCKED(e) (ENVFLAGS(e) & FRAME_LOCK_MASK)
 #define UNLOCK_FRAME(e) SET_ENVFLAGS(e, ENVFLAGS(e) & (~ FRAME_LOCK_MASK))
+#define R_NO_REMAP
 '
 
 src <- '
 if (TYPEOF(env) == NILSXP)
-error("use of NULL environment is defunct");
+Rf_error("use of NULL environment is defunct");
 if (TYPEOF(env) != ENVSXP)
-error("not an environment");
+Rf_error("not an environment");
  
 UNLOCK_FRAME(env);
  

diff --git a/R/iBMA.surv.R b/R/iBMA.surv.R
@@ -23,13 +23,14 @@ https://github.com/SurajGupta/r-source/blob/master/src/main/envir.c
 #define FRAME_LOCK_MASK (1<<14)
 #define FRAME_IS_LOCKED(e) (ENVFLAGS(e) & FRAME_LOCK_MASK)
 #define UNLOCK_FRAME(e) SET_ENVFLAGS(e, ENVFLAGS(e) & (~ FRAME_LOCK_MASK))
+#define R_NO_REMAP
 '
 
 src <- '
 if (TYPEOF(env) == NILSXP)
-error("use of NULL environment is defunct");
+Rf_error("use of NULL environment is defunct");
 if (TYPEOF(env) != ENVSXP)
-error("not an environment");
+Rf_error("not an environment");
  
 UNLOCK_FRAME(env);