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

reactive mixin: try to make all compilers happy

Browse Source
This commit is contained in:
Michele Caini
2024-09-20 09:24:01 +02:00
parent e1e1d37506
commit 9fafb83a41
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/entt/entity/mixin.hpp
View File

@@ -455,7 +455,7 @@ public:
*/
template<typename Clazz, auto Candidate = &basic_reactive_mixin::emplace_element>
void on_construct(const id_type id = type_hash<Clazz>::value()) {
owner_or_assert().storage<Clazz>(id).on_construct().connect<Candidate>(*this);
owner_or_assert().storage<Clazz>(id).on_construct().template connect<Candidate>(*this);
}
/**
@@ -466,7 +466,7 @@ public:
*/
template<typename Clazz, auto Candidate = &basic_reactive_mixin::emplace_element>
void on_update(const id_type id = type_hash<Clazz>::value()) {
owner_or_assert().storage<Clazz>(id).on_update().connect<Candidate>(*this);
owner_or_assert().storage<Clazz>(id).on_update().template connect<Candidate>(*this);
}
/**
@@ -477,7 +477,7 @@ public:
*/
template<typename Clazz, auto Candidate = &basic_reactive_mixin::emplace_element>
void on_destroy(const id_type id = type_hash<Clazz>::value()) {
owner_or_assert().storage<Clazz>(id).on_destroy().connect<Candidate>(*this);
owner_or_assert().storage<Clazz>(id).on_destroy().template connect<Candidate>(*this);
}
/**
@@ -512,7 +512,7 @@ public:
view(exclude_t<Exclude...> = exclude_t{}) const {
const basic_registry_type &parent = owner_or_assert();
basic_view<get_t<const basic_reactive_mixin, typename basic_registry_type::template storage_for_type<const Get>...>, exclude_t<typename basic_registry_type::template storage_for_type<const Exclude>...>> elem{};
[&elem](const auto *...curr) { ((curr ? elem.storage(*curr) : void()), ...); }(parent.storage<std::remove_const_t<Exclude>>()..., parent.storage<std::remove_const_t<Get>>()..., this);
[&elem](const auto *...curr) { ((curr ? elem.storage(*curr) : void()), ...); }(parent.template storage<std::remove_const_t<Exclude>>()..., parent.template storage<std::remove_const_t<Get>>()..., this);
return elem;
}
@@ -521,7 +521,7 @@ public:
[[nodiscard]] basic_view<get_t<const basic_reactive_mixin, typename basic_registry_type::template storage_for_type<Get>...>, exclude_t<typename basic_registry_type::template storage_for_type<Exclude>...>>
view(exclude_t<Exclude...> = exclude_t{}) {
basic_registry_type &parent = owner_or_assert();
return {*this, parent.storage<std::remove_const_t<Get>>()..., parent.storage<std::remove_const_t<Exclude>>()...};
return {*this, parent.template storage<std::remove_const_t<Get>>()..., parent.template storage<std::remove_const_t<Exclude>>()...};
}
private: