Parcourir la source

storage: use storage_type_t everywhere

Michele Caini il y a 3 ans
Parent
commit
ba5b85de00
3 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 2 2
      src/entt/entity/group.hpp
  2. 1 1
      src/entt/entity/registry.hpp
  3. 2 2
      src/entt/entity/view.hpp

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

@@ -134,7 +134,7 @@ class basic_group<Entity, owned_t<>, get_t<Get...>, exclude_t<Exclude...>> {
     static constexpr std::size_t index_of = type_list_index_v<std::remove_const_t<Comp>, type_list<std::remove_const_t<Get>...>>;
 
     template<typename Comp>
-    using storage_for = constness_as_t<typename storage_type<Entity, std::remove_const_t<Comp>>::type, Comp>;
+    using storage_for = constness_as_t<storage_type_t<Entity, std::remove_const_t<Comp>>, Comp>;
 
     using basic_common_type = std::common_type_t<typename storage_for<Get>::base_type...>;
 
@@ -534,7 +534,7 @@ class basic_group<Entity, owned_t<Owned...>, get_t<Get...>, exclude_t<Exclude...
     static constexpr std::size_t index_of = type_list_index_v<std::remove_const_t<Comp>, type_list<std::remove_const_t<Owned>..., std::remove_const_t<Get>...>>;
 
     template<typename Comp>
-    using storage_for = constness_as_t<typename storage_type<Entity, std::remove_const_t<Comp>>::type, Comp>;
+    using storage_for = constness_as_t<storage_type_t<Entity, std::remove_const_t<Comp>>, Comp>;
 
     basic_group(const std::size_t &extent, storage_for<Owned> &...opool, storage_for<Get> &...gpool) noexcept
         : pools{&opool..., &gpool...},

+ 1 - 1
src/entt/entity/registry.hpp

@@ -222,7 +222,7 @@ class basic_registry {
     using basic_common_type = basic_sparse_set<Entity>;
 
     template<typename Comp>
-    using storage_for = constness_as_t<typename storage_type<Entity, std::remove_const_t<Comp>>::type, Comp>;
+    using storage_for = constness_as_t<storage_type_t<Entity, std::remove_const_t<Comp>>, Comp>;
 
     template<typename...>
     struct group_handler;

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

@@ -193,7 +193,7 @@ class basic_view<Entity, get_t<Component...>, exclude_t<Exclude...>> {
     friend class basic_view;
 
     template<typename Comp>
-    using storage_for = constness_as_t<typename storage_type<Entity, std::remove_const_t<Comp>>::type, Comp>;
+    using storage_for = constness_as_t<storage_type_t<Entity, std::remove_const_t<Comp>>, Comp>;
 
     [[nodiscard]] auto opaque_check() const noexcept {
         std::array<const base_type *, sizeof...(Component) - 1u> other{};
@@ -544,7 +544,7 @@ class basic_view<Entity, get_t<Component>, exclude_t<>, std::void_t<std::enable_
     template<typename, typename, typename, typename>
     friend class basic_view;
 
-    using storage_for = constness_as_t<typename storage_type<Entity, std::remove_const_t<Component>>::type, Component>;
+    using storage_for = constness_as_t<storage_type_t<Entity, std::remove_const_t<Component>>, Component>;
 
 public:
     /*! @brief Underlying entity identifier. */