wip

Author: jll63

include/boost/openmethod/inplace_vptr.hpp

@@ -117,7 +117,7 @@ class inplace_vptr;
 
 template<class Class>
 class inplace_vptr<Class>
-    : protected  detail::inplace_vptr_aux<Class, BOOST_OPENMETHOD_DEFAULT_REGISTRY, true> {
+    : detail::inplace_vptr_aux<Class, BOOST_OPENMETHOD_DEFAULT_REGISTRY, true> {
     template<class, class, bool>
     friend class detail::inplace_vptr_aux;
     template<class To, class From>
@@ -126,7 +126,7 @@ class inplace_vptr<Class>
 
 template<class Class, class Other>
 class inplace_vptr<Class, Other>
-    : protected detail::inplace_vptr_aux<Class, Other, detail::is_registry<Other>> {
+    : detail::inplace_vptr_aux<Class, Other, detail::is_registry<Other>> {
     template<class, class, bool>
     friend class detail::inplace_vptr_aux;
     template<class To, class From>
@@ -135,7 +135,7 @@ class inplace_vptr<Class, Other>
 
 template<class Class, class Base1, class Base2, class... MoreBases>
 class inplace_vptr<Class, Base1, Base2, MoreBases...>
-    : protected detail::inplace_vptr_derived {
+    : detail::inplace_vptr_derived {
 
     static_assert(
         !detail::is_registry<Base1> && !detail::is_registry<Base2> &&

test/test_intrusive.cpp

@@ -182,9 +182,7 @@ BOOST_AUTO_TEST_CASE(intrusive_mode) {
 
 struct indirect_policy : test_registry::with<bom::policies::indirect_vptr> {};
 
-struct Indirect : bom::inplace_vptr<Indirect, indirect_policy> {
-    using bom::inplace_vptr<Indirect, indirect_policy>::boost_openmethod_vptr;
-};
+struct Indirect : bom::inplace_vptr<Indirect, indirect_policy> {};
 
 BOOST_OPENMETHOD(whatever, (virtual_<Indirect&>), void, indirect_policy);
 
@@ -195,5 +193,8 @@ BOOST_AUTO_TEST_CASE(core_intrusive_vptr) {
     bom::initialize<indirect_policy>();
     Indirect i;
     BOOST_TEST(
-        i.boost_openmethod_vptr == &indirect_policy::static_vptr<Indirect>);
+        boost_openmethod_vptr(i, nullptr) ==
+        indirect_policy::static_vptr<Indirect>);
+    indirect_policy::static_vptr<Indirect> = nullptr;
+    BOOST_TEST(boost_openmethod_vptr(i, nullptr) == nullptr);
 }