diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp index d35507c42..6d9ae5606 100644 --- a/src/entt/entity/group.hpp +++ b/src/entt/entity/group.hpp @@ -273,7 +273,7 @@ class basic_group; */ template class basic_group, get_t, exclude_t> { - using base_type = std::common_type_t; + using base_type = stl::common_type_t; using underlying_type = base_type::entity_type; template @@ -687,7 +687,7 @@ template class basic_group, get_t, exclude_t> { static_assert(((Owned::storage_policy != deletion_policy::in_place) && ...), "Groups do not support in-place delete"); - using base_type = std::common_type_t; + using base_type = stl::common_type_t; using underlying_type = base_type::entity_type; template diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp index 9a13608a2..dae04c017 100644 --- a/src/entt/entity/view.hpp +++ b/src/entt/entity/view.hpp @@ -408,8 +408,8 @@ private: template requires (sizeof...(Get) != 0u) class basic_view, exclude_t> - : public basic_common_view, internal::tombstone_check_v, sizeof...(Get), sizeof...(Exclude)> { - using base_type = basic_common_view, internal::tombstone_check_v, sizeof...(Get), sizeof...(Exclude)>; + : public basic_common_view, internal::tombstone_check_v, sizeof...(Get), sizeof...(Exclude)> { + using base_type = basic_common_view, internal::tombstone_check_v, sizeof...(Get), sizeof...(Exclude)>; template using element_at = type_list_element_t>; diff --git a/src/entt/stl/type_traits.hpp b/src/entt/stl/type_traits.hpp index 8ebd3d489..6c27f064e 100644 --- a/src/entt/stl/type_traits.hpp +++ b/src/entt/stl/type_traits.hpp @@ -7,6 +7,7 @@ namespace entt::stl { using std::bool_constant; +using std::common_type_t; using std::decay_t; using std::extent_v; using std::false_type;