From 09b260e0aff9fc3d6dfc7df6dc904c3ee95fdd4b Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 15 Nov 2021 14:43:20 +0100 Subject: [PATCH] view: use explicit types to also please clang 6.x --- src/entt/entity/view.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index 791c15544..985130fed 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -232,7 +232,7 @@ class basic_view, exclude_t> { template using storage_type_t = constness_as_t>::storage_type, Comp>; - static constexpr auto is_multi_type_v = ((sizeof...(Component) + sizeof...(Exclude)) != 1u); + static constexpr bool is_multi_type_v = ((sizeof...(Component) + sizeof...(Exclude)) != 1u); using basic_common_type = std::common_type_t::base_type...>; class iterable final { @@ -305,7 +305,7 @@ class basic_view, exclude_t> { const basic_view view; }; - template + template [[nodiscard]] auto test_set(std::index_sequence) const ENTT_NOEXCEPT { std::size_t pos{}; std::array other{}; @@ -313,7 +313,7 @@ class basic_view, exclude_t> { return other; } - template + template [[nodiscard]] auto dispatch_get(const std::tuple &curr) const { if constexpr(Comp == Other) { return std::forward_as_tuple(std::get(curr)...); @@ -322,7 +322,7 @@ class basic_view, exclude_t> { } } - template + template void each(Func func, std::index_sequence) const { for(const auto curr: internal::iterable_storage{*std::get(pools)}) { const auto entt = std::get<0>(curr); @@ -339,7 +339,7 @@ class basic_view, exclude_t> { } } - template + template void pick_and_each(Func func, std::index_sequence seq) const { ((std::get(pools) == view ? each(std::move(func), seq) : void()), ...); }