Skip to content

Commit c0441b5

Browse files
committed
Add prot argument to external_pointer() constructor
r-lib/cpp11#420 This reverts commit abcae40e2aff8b1664098294959b8df743605737.
1 parent c4dabce commit c0441b5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

inst/include/cpp11/external_pointer.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ class external_pointer {
5757

5858
external_pointer(SEXP data) : data_(valid_type(data)) {}
5959

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,
61+
SEXP prot = R_NilValue)
62+
: data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, prot)) {
6263
if (use_deleter) {
6364
R_RegisterCFinalizerEx(data_, r_deleter, static_cast<r_bool>(finalize_on_exit));
6465
}

0 commit comments

Comments
 (0)