wip

Author: jll63

doc/modules/ROOT/pages/reference.adoc

@@ -7,7 +7,7 @@
 |===
 | Name
 | Description
-| xref::BOOST_OPENMETHOD.adoc[BOOST_OPENMETHOD]
+| xref:BOOST_OPENMETHOD.adoc[BOOST_OPENMETHOD]
 | declares a method
 | xref:BOOST_OPENMETHOD_CLASSES.adoc[BOOST_OPENMETHOD_CLASSES]
 | registers classes
@@ -81,10 +81,6 @@
 |
 | xref:reference:boost/openmethod/release_registry.adoc[`release_registry`]
 |
-| xref:reference:boost/openmethod/same_smart_ptr_aux-0f.adoc[`same_smart_ptr_aux`]
-|
-| xref:reference:boost/openmethod/same_smart_ptr_aux-02.adoc[`same_smart_ptr_aux<Class, Other, Registry, std::void_t<virtual_traits<Class, Registry>::rebind<Other::element_type>>>`]
-|
 | xref:reference:boost/openmethod/static_offset_error.adoc[`static_offset_error`]
 |
 | xref:reference:boost/openmethod/static_slot_error.adoc[`static_slot_error`]
@@ -98,8 +94,8 @@
 | xref:reference:boost/openmethod/virtual_.adoc[`virtual_`]
 |
 | xref:reference:boost/openmethod/virtual_ptr-0a.adoc[`virtual_ptr`]
-| A virtual_ptr.
-| xref:reference:boost/openmethod/virtual_ptr-02.adoc[`virtual_ptr<Class, Registry, void>`]
+| A wide pointer combining a pointer to an object and a pointer to its v‐table.
+| xref:reference:boost/openmethod/virtual_ptr-02.adoc[`virtual_ptr<Class, Registry>`]
 |
 | xref:reference:boost/openmethod/virtual_traits-0be.adoc[`virtual_traits`]
 |
@@ -162,7 +158,7 @@
 | Name
 | xref:reference:boost/openmethod/is_method.adoc[`is_method`]
 | xref:reference:boost/openmethod/is_polymorphic.adoc[`is_polymorphic`]
-| xref:reference:boost/openmethod/is_virtual_smart_ptr.adoc[`is_virtual_smart_ptr`]
+| xref:reference:boost/openmethod/is_smart_ptr.adoc[`is_smart_ptr`]
 | xref:reference:boost/openmethod/same_smart_ptr.adoc[`same_smart_ptr`]
 |===
 

doc/tagfiles/boost-openmethod-doxygen.tag.xml

@@ -25,8 +25,6 @@
   <class kind="class">boost::openmethod::openmethod_error</class>
   <class kind="class">boost::openmethod::registry</class>
   <class kind="class">boost::openmethod::release_registry</class>
-  <class kind="class">boost::openmethod::same_smart_ptr_aux</class>
-  <class kind="class">boost::openmethod::same_smart_ptr_aux</class>
   <class kind="class">boost::openmethod::static_offset_error</class>
   <class kind="class">boost::openmethod::static_slot_error</class>
   <class kind="class">boost::openmethod::static_stride_error</class>
@@ -47,7 +45,7 @@
   <class kind="class">boost::openmethod::final_virtual_ptr</class>
   <class kind="class">boost::openmethod::is_method</class>
   <class kind="class">boost::openmethod::is_polymorphic</class>
-  <class kind="class">boost::openmethod::is_virtual_smart_ptr</class>
+  <class kind="class">boost::openmethod::is_smart_ptr</class>
   <class kind="class">boost::openmethod::same_smart_ptr</class>
   <class kind="class">boost::openmethod::virtual_ptr</class>
   <class kind="class">boost::openmethod::virtual_ptr</class>
@@ -617,14 +615,6 @@
     <arglist>()</arglist>
   </member>
 </compound>
-<compound kind="class">
-  <name>boost::openmethod::same_smart_ptr_aux</name>
-  <filename>boost/openmethod/same_smart_ptr_aux-0f.adoc</filename>
-</compound>
-<compound kind="class">
-  <name>boost::openmethod::same_smart_ptr_aux</name>
-  <filename>boost/openmethod/same_smart_ptr_aux-02.adoc</filename>
-</compound>
 <compound kind="class">
   <name>boost::openmethod::static_offset_error</name>
   <filename>boost/openmethod/static_offset_error.adoc</filename>
@@ -937,8 +927,8 @@
   <filename>boost/openmethod/is_polymorphic.adoc</filename>
 </compound>
 <compound kind="class">
-  <name>boost::openmethod::is_virtual_smart_ptr</name>
-  <filename>boost/openmethod/is_virtual_smart_ptr.adoc</filename>
+  <name>boost::openmethod::is_smart_ptr</name>
+  <filename>boost/openmethod/is_smart_ptr.adoc</filename>
 </compound>
 <compound kind="class">
   <name>boost::openmethod::same_smart_ptr</name>

include/boost/openmethod/core.hpp

@@ -34,7 +34,7 @@
 
 namespace boost::openmethod {
 
-template<class Registry, class Class>
+template<class Class, class Registry>
 constexpr bool is_polymorphic = Registry::rtti::template is_polymorphic<Class>;
 
 template<
@@ -280,24 +280,6 @@ struct use_classes {
     tuple_type tuple;
 };
 
-namespace detail {
-
-template<typename, class, typename = void>
-struct is_virtual_smart_ptr_aux : std::false_type {};
-
-template<typename Class, class Registry>
-struct is_virtual_smart_ptr_aux<
-    Class, Registry,
-    std::void_t<
-        typename virtual_traits<Class, Registry>::template rebind<Class>>>
-    : std::true_type {};
-
-} // namespace detail
-
-template<typename T, class Registry>
-constexpr bool is_virtual_smart_ptr =
-    detail::is_virtual_smart_ptr_aux<T, Registry>::value;
-
 // =============================================================================
 // virtual_ptr
 
@@ -374,7 +356,7 @@ inline auto final_virtual_ptr(Arg&& obj) {
     using Class = typename VirtualPtr::element_type;
     using Traits = virtual_traits<Arg, Registry>;
 
-    if constexpr (Registry::runtime_checks && is_polymorphic<Registry, Class>) {
+    if constexpr (Registry::runtime_checks && is_polymorphic<Class, Registry>) {
 
         // check that dynamic type == static type
         auto static_type = Registry::rtti::template static_type<Class>();
@@ -448,7 +430,7 @@ class virtual_ptr {
         class Other,
         typename = std::enable_if_t<
             std::is_constructible_v<Class*, Other*> &&
-            is_polymorphic<Registry, Class>>>
+            is_polymorphic<Class, Registry>>>
     virtual_ptr(Other& other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               detail::acquire_vptr<Registry>(other))),
@@ -459,9 +441,8 @@ class virtual_ptr {
         class Other,
         typename = std::enable_if_t<
             std::is_constructible_v<
-                Class*,
-                typename virtual_ptr<Other, Registry>::element_type*> &&
-            is_polymorphic<Registry, Class>>>
+                Class*, typename virtual_ptr<Other, Registry>::element_type*> &&
+            is_polymorphic<Class, Registry>>>
     virtual_ptr(Other* other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               detail::acquire_vptr<Registry>(*other))),
@@ -471,17 +452,15 @@ class virtual_ptr {
     template<
         class Other,
         typename = std::enable_if_t<std::is_constructible_v<
-            Class*,
-            typename virtual_ptr<Other, Registry>::element_type*>>>
+            Class*, typename virtual_ptr<Other, Registry>::element_type*>>>
     virtual_ptr(const virtual_ptr<Other, Registry>& other)
         : vp(other.vp), obj(other.get()) {
     }
 
     template<
         class Other,
         typename = std::enable_if_t<std::is_constructible_v<
-            Class*,
-            typename virtual_ptr<Other, Registry>::element_type*>>>
+            Class*, typename virtual_ptr<Other, Registry>::element_type*>>>
     virtual_ptr(virtual_ptr<Other, Registry>& other)
         : vp(other.vp), obj(other.get()) {
         // Why is this needed? Consider this conversion conversion from
@@ -504,7 +483,7 @@ class virtual_ptr {
         class Other,
         typename = std::enable_if_t<
             std::is_assignable_v<Class*, Other*> &&
-            is_polymorphic<Registry, Class>>>
+            is_polymorphic<Class, Registry>>>
     virtual_ptr& operator=(Other& other) {
         obj = &other;
         vp = detail::box_vptr<use_indirect_vptrs>(
@@ -516,7 +495,7 @@ class virtual_ptr {
         class Other,
         typename = std::enable_if_t<
             std::is_assignable_v<Class*, Other*> &&
-            is_polymorphic<Registry, Class>>>
+            is_polymorphic<Class, Registry>>>
     virtual_ptr& operator=(Other* other) {
         obj = other;
         vp = detail::box_vptr<use_indirect_vptrs>(
@@ -527,8 +506,7 @@ class virtual_ptr {
     template<
         class Other,
         typename = std::enable_if_t<std::is_assignable_v<
-            Class*,
-            typename virtual_ptr<Other, Registry>::element_type*>>>
+            Class*, typename virtual_ptr<Other, Registry>::element_type*>>>
     virtual_ptr& operator=(const virtual_ptr<Other, Registry>& other) {
         obj = other.get();
         vp = other.vp;
@@ -576,6 +554,18 @@ class virtual_ptr {
     }
 };
 
+namespace detail {
+
+template<typename, class, typename = void>
+struct is_smart_ptr_aux : std::false_type {};
+
+template<typename Class, class Registry>
+struct is_smart_ptr_aux<
+    Class, Registry,
+    std::void_t<
+        typename virtual_traits<Class, Registry>::template rebind<Class>>>
+    : std::true_type {};
+
 template<class Class, class Other, class Registry, typename = void>
 struct same_smart_ptr_aux : std::false_type {};
 
@@ -589,17 +579,18 @@ struct same_smart_ptr_aux<
           typename virtual_traits<Class, Registry>::template rebind<
               typename Other::element_type>> {};
 
+} // namespace detail
+
+template<typename T, class Registry>
+constexpr bool is_smart_ptr = detail::is_smart_ptr_aux<T, Registry>::value;
+
 template<class Class, class Other, class Registry>
 constexpr bool same_smart_ptr =
-    same_smart_ptr_aux<Class, Other, Registry>::value;
+    detail::same_smart_ptr_aux<Class, Other, Registry>::value;
 
 template<class Class, class Registry>
-BOOST_OPENMETHOD_DETAIL_CXX20(requires(is_virtual_smart_ptr<Class, Registry>))
 class virtual_ptr<
-    Class, Registry,
-    BOOST_OPENMETHOD_DETAIL_CXX17(
-        std::void_t<typename virtual_traits<Class, Registry>::template rebind<
-            Class>>) BOOST_OPENMETHOD_DETAIL_CXX20(void)> {
+    Class, Registry, std::enable_if_t<is_smart_ptr<Class, Registry>>> {
 
     template<class, class, typename>
     friend class virtual_ptr;
@@ -637,7 +628,7 @@ class virtual_ptr<
         typename = std::enable_if_t<
             same_smart_ptr<Class, Other, Registry> &&
             std::is_constructible_v<Class, const Other&> &&
-            is_polymorphic<Registry, element_type>>>
+            is_polymorphic<element_type, Registry>>>
     virtual_ptr(const Other& other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               other ? detail::acquire_vptr<Registry>(*other)
@@ -650,7 +641,7 @@ class virtual_ptr<
         typename = std::enable_if_t<
             same_smart_ptr<Class, Other, Registry> &&
             std::is_constructible_v<Class, Other&> &&
-            is_polymorphic<Registry, element_type>>>
+            is_polymorphic<element_type, Registry>>>
     virtual_ptr(Other& other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               other ? detail::acquire_vptr<Registry>(*other)
@@ -669,7 +660,7 @@ class virtual_ptr<
         typename = std::enable_if_t<
             same_smart_ptr<Class, Other, Registry> &&
             std::is_constructible_v<Class, Other&&> &&
-            is_polymorphic<Registry, element_type>>>
+            is_polymorphic<element_type, Registry>>>
     virtual_ptr(Other&& other)
         : vp(detail::box_vptr<use_indirect_vptrs>(
               other ? detail::acquire_vptr<Registry>(*other)
@@ -725,7 +716,7 @@ class virtual_ptr<
         typename = std::enable_if_t<
             same_smart_ptr<Class, Other, Registry> &&
             std::is_assignable_v<Class, const Other&> &&
-            is_polymorphic<Registry, element_type>>>
+            is_polymorphic<element_type, Registry>>>
     virtual_ptr& operator=(const Other& other) {
         obj = other;
         vp = detail::box_vptr<use_indirect_vptrs>(
@@ -738,7 +729,7 @@ class virtual_ptr<
         typename = std::enable_if_t<
             same_smart_ptr<Class, Other, Registry> &&
             std::is_assignable_v<Class, Other&&> &&
-            is_polymorphic<Registry, element_type>>>
+            is_polymorphic<element_type, Registry>>>
     virtual_ptr& operator=(Other&& other) {
         vp = detail::box_vptr<use_indirect_vptrs>(
             other ? detail::acquire_vptr<Registry>(*other) : detail::null_vptr);