Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poly: make it work also with non-default Len

Browse Source
This commit is contained in:
Michele Caini
2021-02-27 17:34:09 +01:00
parent e7e7b06744
commit a62a83044f
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/entt/poly/poly.hpp
View File

@@ -44,25 +44,26 @@ struct poly_inspector {
/**
* @brief Static virtual table factory.
* @tparam Concept Concept descriptor.
* @tparam Len Size of the storage reserved for the small buffer optimization.
*/
template<typename Concept>
template<typename Concept, std::size_t Len>
class poly_vtable {
using inspector = typename Concept::template type<poly_inspector>;
template<typename Ret, typename... Args>
static auto vtable_entry(Ret(*)(inspector &, Args...)) -> Ret(*)(any &, Args...);
static auto vtable_entry(Ret(*)(inspector &, Args...)) -> Ret(*)(basic_any<Len> &, Args...);
template<typename Ret, typename... Args>
static auto vtable_entry(Ret(*)(const inspector &, Args...)) -> Ret(*)(const any &, Args...);
static auto vtable_entry(Ret(*)(const inspector &, Args...)) -> Ret(*)(const basic_any<Len> &, Args...);
template<typename Ret, typename... Args>
static auto vtable_entry(Ret(*)(Args...)) -> Ret(*)(const any &, Args...);
static auto vtable_entry(Ret(*)(Args...)) -> Ret(*)(const basic_any<Len> &, Args...);
template<typename Ret, typename... Args>
static auto vtable_entry(Ret(inspector:: *)(Args...)) -> Ret(*)(any &, Args...);
static auto vtable_entry(Ret(inspector:: *)(Args...)) -> Ret(*)(basic_any<Len> &, Args...);
template<typename Ret, typename... Args>
static auto vtable_entry(Ret(inspector:: *)(Args...) const) -> Ret(*)(const any &, Args...);
static auto vtable_entry(Ret(inspector:: *)(Args...) const) -> Ret(*)(const basic_any<Len> &, Args...);
template<auto... Candidate>
static auto make_vtable(value_list<Candidate...>)
@@ -178,7 +179,7 @@ class poly: private Concept::template type<poly_base<poly<Concept, Len>>> {
/*! @brief A poly base is allowed to snoop into a poly object. */
friend struct poly_base<poly>;
using vtable_type = typename poly_vtable<Concept>::type;
using vtable_type = typename poly_vtable<Concept, Len>::type;
public:
/*! @brief Concept type. */
@@ -199,7 +200,7 @@ public:
template<typename Type, typename... Args>
explicit poly(std::in_place_type_t<Type>, Args &&... args)
: storage{std::in_place_type<Type>, std::forward<Args>(args)...},
vtable{poly_vtable<Concept>::template instance<std::remove_const_t<std::remove_reference_t<Type>>>()}
vtable{poly_vtable<Concept, Len>::template instance<std::remove_const_t<std::remove_reference_t<Type>>>()}
{}
/**
@@ -278,7 +279,7 @@ public:
template<typename Type, typename... Args>
void emplace(Args &&... args) {
storage.template emplace<Type>(std::forward<Args>(args)...);
vtable = poly_vtable<Concept>::template instance<Type>();
vtable = poly_vtable<Concept, Len>::template instance<Type>();
}
/*! @brief Destroys contained object */

2
test/entt/entity/poly_storage.cpp
View File

@@ -22,7 +22,7 @@ struct PolyStorage: entt::type_list_cat_t<
template<typename Base>
struct type: entt::Storage<Entity>::template type<Base> {
static constexpr auto base = std::tuple_size_v<typename entt::poly_vtable<entt::Storage<Entity>>::type>;
static constexpr auto base = decltype(as_type_list(std::declval<entt::Storage<Entity>>()))::size;
void remove(entt::basic_registry<Entity> &owner, const entity_type *first, const entity_type *last) {
entt::poly_call<base + 0>(*this, first, last, &owner);

5
test/entt/poly/poly_deduced.cpp
View File

@@ -221,4 +221,9 @@ TEST(PolyDeduced, SBOVsZeroedSBOSize) {
entt::poly<Deduced, 0u> same = std::move(dyn);
ASSERT_EQ(valid, same.data());
// everything works as expected
same->incr();
ASSERT_EQ(same->get(), 1);
}

5
test/entt/poly/poly_defined.cpp
View File

@@ -227,4 +227,9 @@ TEST(PolyDefined, SBOVsZeroedSBOSize) {
entt::poly<Defined, 0u> same = std::move(dyn);
ASSERT_EQ(valid, same.data());
// everything works as expected
same->incr();
ASSERT_EQ(same->get(), 1);
}