From 4e7368f79a201da952257790cb918e62a28a91af Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 25 Sep 2023 14:26:10 +0200 Subject: [PATCH] storage: entity storage no longer has component traits exposed --- src/entt/entity/storage.hpp | 2 -- test/entt/entity/view.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp index ad53d9314..6a76f5e3a 100644 --- a/src/entt/entity/storage.hpp +++ b/src/entt/entity/storage.hpp @@ -979,8 +979,6 @@ public: using base_type = basic_sparse_set; /*! @brief Type of the objects assigned to entities. */ using value_type = Entity; - /*! @brief Component traits. */ - using traits_type = component_traits; /*! @brief Underlying entity identifier. */ using entity_type = Entity; /*! @brief Unsigned integer type. */ diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp index de826c5ad..5bb8e09b4 100644 --- a/test/entt/entity/view.cpp +++ b/test/entt/entity/view.cpp @@ -580,7 +580,7 @@ TEST(SingleComponentView, StorageEntity) { registry.destroy(entity, entt::to_version(entity)); - ASSERT_EQ(view.size(), 2u); + ASSERT_EQ(view.size_hint(), 2u); ASSERT_NE(view.begin(), view.end()); // returns all matching identifiers, both in-use and available ones @@ -589,8 +589,8 @@ TEST(SingleComponentView, StorageEntity) { ASSERT_EQ(*(++view.begin()), other); // skips available identifiers automatically, only returns in-use elements - for(auto [entt]: view.each()) { - ASSERT_EQ(entt, other); + for(auto elem: view.each()) { + ASSERT_EQ(std::get<0>(elem), other); } // skips available identifiers automatically, only returns in-use elements