Skip to content

Commit 0070941

Browse files
committed
Revert "Reapply 782630b minus the whitespace changes"
This reverts commit f05d56c.
1 parent ce119b0 commit 0070941

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

inst/include/cpp11/external_pointer.hpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,9 @@ class external_pointer {
6868
data_ = safe[Rf_shallow_duplicate](rhs.data_);
6969
}
7070

71-
external_pointer(external_pointer&& rhs) {
72-
data_ = rhs.data_;
73-
rhs.data_ = R_NilValue;
74-
}
71+
external_pointer(external_pointer&& rhs) { reset(rhs.release()); }
7572

76-
external_pointer& operator=(external_pointer&& rhs) noexcept {
77-
data_ = rhs.data_;
78-
rhs.data_ = R_NilValue;
79-
}
73+
external_pointer& operator=(external_pointer&& rhs) noexcept { reset(rhs.release()); }
8074

8175
external_pointer& operator=(std::nullptr_t) noexcept { reset(); };
8276

0 commit comments

Comments
 (0)