wip

Author: jll63

include/boost/openmethod/core.hpp

@@ -705,8 +705,7 @@ class virtual_ptr {
         typename = std::enable_if_t<
             BOOST_OPENMETHOD_DETAIL_UNLESS_MRDOCS
                 IsPolymorphic<Class, Registry> &&
-            std::is_constructible_v<
-                Class*, typename virtual_ptr<Other, Registry>::element_type*>>>
+            std::is_constructible_v<Class*, Other*>>>
     virtual_ptr(Other* other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               detail::acquire_vptr<Registry>(*other))),
@@ -1105,7 +1104,13 @@ class virtual_ptr<
     }
 
     virtual_ptr(const virtual_ptr& other) = default;
-    virtual_ptr(virtual_ptr&& other) = default;
+
+    virtual_ptr(virtual_ptr&& other)
+        : vp(std::exchange(
+              other.vp,
+              detail::box_vptr<use_indirect_vptrs>(detail::null_vptr))),
+          obj(std::move(other.obj)) {
+    }
 
     //! Construct from a (const) smart pointer to a derived class
     //!
@@ -1304,7 +1309,7 @@ class virtual_ptr<
         : vp(other.vp), obj(other.obj) {
     }
 
-    //! Move from a virtual pointer to a derived class
+    //! Construct-move from a virtual pointer to a derived class
     //!
     //! Move the object pointer from `other` to `this`. Copy the v-table pointer
     //! from `other`.
@@ -1341,8 +1346,10 @@ class virtual_ptr<
                 SameSmartPtr<SmartPtr, Other, Registry> &&
             std::is_constructible_v<SmartPtr, Other&&>>>
     virtual_ptr(virtual_ptr<Other, Registry>&& other)
-        : vp(other.vp), obj(std::move(other.obj)) {
-        other.vp = detail::box_vptr<use_indirect_vptrs>(detail::null_vptr);
+        : vp(std::exchange(
+              other.vp,
+              detail::box_vptr<use_indirect_vptrs>(detail::null_vptr))),
+          obj(std::move(other.obj)) {
     }
 
     //! Assign from `nullptr`
@@ -1577,9 +1584,10 @@ class virtual_ptr<
                 SameSmartPtr<SmartPtr, Other, Registry> &&
             std::is_assignable_v<SmartPtr, Other&&>>>
     virtual_ptr& operator=(virtual_ptr<Other, Registry>&& other) {
+        vp = std::exchange(
+            other.vp, detail::box_vptr<use_indirect_vptrs>(detail::null_vptr));
         obj = std::move(other.obj);
-        vp = other.vp;
-        other.vp = detail::box_vptr<use_indirect_vptrs>(detail::null_vptr);
+
         return *this;
     }