Revert "Revert fb18a2d"

krlmlr · krlmlr · commit 6f4979db3f9c · 2024-09-24T09:35:27.000+02:00
This reverts commit 9a9b340c9f8f9caa9125e6c55d6502a76a2c5884.
diff --git a/inst/include/cpp11/external_pointer.hpp b/inst/include/cpp11/external_pointer.hpp
@@ -57,8 +57,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
`@@ -57,8 +57,8 @@ class external_pointer {`
`57`	`57`
`58`	`58`	`external_pointer(SEXP data) : data_(valid_type(data)) {}`
`59`	`59`
`60`		`- external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true)`
`61`		`- : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, R_NilValue)) {`
	`60`	`+ external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true, SEXP prot = R_NilValue)`
	`61`	`+ : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, prot)) {`
`62`	`62`	`if (use_deleter) {`
`63`	`63`	`R_RegisterCFinalizerEx(data_, r_deleter, static_cast<r_bool>(finalize_on_exit));`
`64`	`64`	`}`