From 6ec719bcfa7ac001e593f9ddcc07e7f925198c4e Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 29 Mar 2023 12:54:39 +0200 Subject: [PATCH] group: reduce the footprint of non-owning group handlers --- src/entt/entity/group.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp index 900181cff..352b4144f 100644 --- a/src/entt/entity/group.hpp +++ b/src/entt/entity/group.hpp @@ -175,7 +175,7 @@ private: }; template -class group_handler, get_t, exclude_t>: public basic_group_handler { +class group_handler, get_t, exclude_t> { // nasty workaround for an issue with the toolset v141 that doesn't accept a fold expression here static_assert(!std::disjunction_v..., std::is_const...>, "Const storage type not allowed"); @@ -207,8 +207,7 @@ public: template group_handler(const Alloc &alloc, Get &...gpool, Exclude &...epool) - : basic_group_handler{/* temporary, to be removed */}, - pools{&gpool...}, + : pools{&gpool...}, filter{&epool...}, elem{alloc} { std::apply([this](auto *...cpool) { ((cpool->on_construct().template connect<&group_handler::push_on_construct>(*this), cpool->on_destroy().template connect<&group_handler::remove_if>(*this)), ...); }, pools);