feat: Add prot argument to external_pointer() constructor

krlmlr · krlmlr · commit a6ad50ab3534 · 2024-12-07T20:38:23.000+01:00
diff --git a/inst/include/cpp11/external_pointer.hpp b/inst/include/cpp11/external_pointer.hpp
@@ -55,8 +55,8 @@ class external_pointer {
 
   external_pointer(SEXP data) : data_(valid_type(data)) {}
 
-  external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true)
-      : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, R_NilValue)) {
+  external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true, SEXP prot = R_NilValue)
+      : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, prot)) {
     if (use_deleter) {
       R_RegisterCFinalizerEx(data_, r_deleter, static_cast<r_bool>(finalize_on_exit));
     }

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ class external_pointer {`
`55`	`55`
`56`	`56`	`external_pointer(SEXP data) : data_(valid_type(data)) {}`
`57`	`57`
`58`		`- external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true)`
`59`		`- : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, R_NilValue)) {`
	`58`	`+ external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true, SEXP prot = R_NilValue)`
	`59`	`+ : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, prot)) {`
`60`	`60`	`if (use_deleter) {`
`61`	`61`	`R_RegisterCFinalizerEx(data_, r_deleter, static_cast<r_bool>(finalize_on_exit));`
`62`	`62`	`}`