boost/openmethod
2
0
Fork 0
mirror of https://github.com/boostorg/openmethod.git synced 2026-01-19 04:22:12 +00:00
Code Issues Projects Releases Wiki Activity

move use_classes for with_vptr to detail

Browse Source
This commit is contained in:
Jean-Louis Leroy
2025-04-23 19:07:30 -04:00
parent c679bf0737
commit ec21ceaa05
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/openmethod/core.hpp
View File

@@ -288,12 +288,8 @@ struct use_classes {
detail::inheritance_map,
typename detail::extract_policy<Classes...>::others>>>;
tuple_type tuple;
static use_classes instance;
};
template<class... Classes>
use_classes<Classes...> use_classes<Classes...>::instance;
// =============================================================================
// virtual_ptr

12
include/boost/openmethod/with_vptr.hpp
View File

@@ -56,6 +56,9 @@ class with_vptr_aux;
#pragma GCC diagnostic ignored "-Wnon-template-friend"
#endif
template<class... Classes>
inline use_classes<Classes...> with_vptr_use_classes;
template<class Class, class Policy>
class with_vptr_aux<Class, Policy, true> {
protected:
@@ -65,7 +68,7 @@ class with_vptr_aux<Class, Policy, true> {
friend auto boost_openmethod_bases(Class*) -> mp11::mp_list<>;
with_vptr_aux() {
(void)&use_classes<Class, Policy>::instance;
(void)&with_vptr_use_classes<Class, Policy>;
detail::update_vptr<Class>(static_cast<Class*>(this));
}
@@ -95,7 +98,7 @@ class with_vptr_aux<Class, Base, false> : with_vptr_derived {
friend void update_vptr(Class*);
with_vptr_aux() {
(void)&use_classes<Class, Base, with_vptr_policy<Class>>::instance;
(void)&with_vptr_use_classes<Class, Base, with_vptr_policy<Class>>;
detail::update_vptr<Class>(static_cast<Class*>(this));
}
@@ -130,9 +133,8 @@ class with_vptr<Class, Base1, Base2, MoreBases...> : detail::with_vptr_derived {
protected:
with_vptr() {
(void)&use_classes<
Class, Base1, Base2, MoreBases...,
detail::with_vptr_policy<Base1>>::instance;
(void)&detail::with_vptr_use_classes<
Class, Base1, Base2, MoreBases..., detail::with_vptr_policy<Base1>>;
detail::update_vptr<Class>(static_cast<Class*>(this));
}