Merge pull request #1157 from stan-dev/c-api-extptr

andrjohns · web-flow · commit 88566bbaeb68 · 2025-03-11T22:38:42.000+08:00
Replace non-API EXTPTR_PTR with R_ExternalPtrAddr
diff --git a/rstan/rstan/src/misc.cpp b/rstan/rstan/src/misc.cpp
@@ -44,10 +44,8 @@ SEXP is_Null_NS(SEXP ns) {
   LOGICAL(ans)[0] = 1;
   PROTECT(ns);
   if (TYPEOF(ns) == EXTPTRSXP) {
-    // Rprintf("ptr=%p.\n", EXTPTR_PTR(ns));
-    if (EXTPTR_PTR(ns) != NULL) LOGICAL(ans)[0] = 0;
+    if (R_ExternalPtrAddr(ns) != NULL) LOGICAL(ans)[0] = 0;
   }
   UNPROTECT(2);
   return ans;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,8 @@ SEXP is_Null_NS(SEXP ns) {`
`44`	`44`	`LOGICAL(ans)[0] = 1;`
`45`	`45`	`PROTECT(ns);`
`46`	`46`	`if (TYPEOF(ns) == EXTPTRSXP) {`
`47`		`- // Rprintf("ptr=%p.\n", EXTPTR_PTR(ns));`
`48`		`- if (EXTPTR_PTR(ns) != NULL) LOGICAL(ans)[0] = 0;`
	`47`	`+ if (R_ExternalPtrAddr(ns) != NULL) LOGICAL(ans)[0] = 0;`
`49`	`48`	`}`
`50`	`49`	`UNPROTECT(2);`
`51`	`50`	`return ans;`
`52`	`51`	`}`
`53`		`-`