skypjack пре 5 дана
родитељ
комит
d596ba854f
3 измењених фајлова са 5 додато и 4 уклоњено
  1. 2 2
      src/entt/entity/group.hpp
  2. 2 2
      src/entt/entity/view.hpp
  3. 1 0
      src/entt/stl/type_traits.hpp

+ 2 - 2
src/entt/entity/group.hpp

@@ -273,7 +273,7 @@ class basic_group;
  */
 template<typename... Get, typename... Exclude>
 class basic_group<owned_t<>, get_t<Get...>, exclude_t<Exclude...>> {
-    using base_type = std::common_type_t<typename Get::base_type..., typename Exclude::base_type...>;
+    using base_type = stl::common_type_t<typename Get::base_type..., typename Exclude::base_type...>;
     using underlying_type = base_type::entity_type;
 
     template<typename Type>
@@ -687,7 +687,7 @@ template<typename... Owned, typename... Get, typename... Exclude>
 class basic_group<owned_t<Owned...>, get_t<Get...>, exclude_t<Exclude...>> {
     static_assert(((Owned::storage_policy != deletion_policy::in_place) && ...), "Groups do not support in-place delete");
 
-    using base_type = std::common_type_t<typename Owned::base_type..., typename Get::base_type..., typename Exclude::base_type...>;
+    using base_type = stl::common_type_t<typename Owned::base_type..., typename Get::base_type..., typename Exclude::base_type...>;
     using underlying_type = base_type::entity_type;
 
     template<typename Type>

+ 2 - 2
src/entt/entity/view.hpp

@@ -408,8 +408,8 @@ private:
 template<typename... Get, typename... Exclude>
 requires (sizeof...(Get) != 0u)
 class basic_view<get_t<Get...>, exclude_t<Exclude...>>
-    : public basic_common_view<std::common_type_t<typename Get::base_type...>, internal::tombstone_check_v<Get...>, sizeof...(Get), sizeof...(Exclude)> {
-    using base_type = basic_common_view<std::common_type_t<typename Get::base_type...>, internal::tombstone_check_v<Get...>, sizeof...(Get), sizeof...(Exclude)>;
+    : public basic_common_view<stl::common_type_t<typename Get::base_type...>, internal::tombstone_check_v<Get...>, sizeof...(Get), sizeof...(Exclude)> {
+    using base_type = basic_common_view<stl::common_type_t<typename Get::base_type...>, internal::tombstone_check_v<Get...>, sizeof...(Get), sizeof...(Exclude)>;
 
     template<std::size_t Index>
     using element_at = type_list_element_t<Index, type_list<Get..., Exclude...>>;

+ 1 - 0
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;