|
|
@@ -62,20 +62,20 @@ struct create_from_constructor {
|
|
|
};
|
|
|
|
|
|
template<>
|
|
|
-struct entt::component_traits<std::unordered_set<char>> {
|
|
|
+struct entt::component_traits_deprecated<std::unordered_set<char>> {
|
|
|
static constexpr auto in_place_delete = true;
|
|
|
static constexpr auto page_size = 4u;
|
|
|
};
|
|
|
|
|
|
template<>
|
|
|
-struct entt::component_traits<int> {
|
|
|
+struct entt::component_traits_deprecated<int> {
|
|
|
static constexpr auto in_place_delete = false;
|
|
|
static constexpr auto page_size = 128u;
|
|
|
};
|
|
|
|
|
|
template<typename Type>
|
|
|
struct Storage: testing::Test {
|
|
|
- static_assert(entt::component_traits<Type>::page_size != 0u, "Empty type not allowed");
|
|
|
+ static_assert(entt::component_traits_deprecated<Type>::page_size != 0u, "Empty type not allowed");
|
|
|
|
|
|
using type = Type;
|
|
|
};
|
|
|
@@ -90,7 +90,7 @@ TYPED_TEST_SUITE(StorageDeathTest, StorageTypes, );
|
|
|
|
|
|
TYPED_TEST(Storage, Constructors) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
@@ -164,7 +164,7 @@ TYPED_TEST(Storage, Move) {
|
|
|
|
|
|
TYPED_TEST(Storage, Swap) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
entt::storage<value_type> other;
|
|
|
@@ -198,7 +198,7 @@ TYPED_TEST(Storage, Swap) {
|
|
|
|
|
|
TYPED_TEST(Storage, Capacity) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
@@ -215,7 +215,7 @@ TYPED_TEST(Storage, Capacity) {
|
|
|
|
|
|
TYPED_TEST(Storage, ShrinkToFit) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
@@ -544,11 +544,11 @@ TYPED_TEST(Storage, IteratorConversion) {
|
|
|
|
|
|
TYPED_TEST(Storage, IteratorPageSizeAwareness) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
- static_assert(!std::is_same_v<value_type, int> || (traits_type::page_size != entt::component_traits<value_type *>::page_size), "Different page size required");
|
|
|
+ static_assert(!std::is_same_v<value_type, int> || (traits_type::page_size != entt::component_traits_deprecated<value_type *>::page_size), "Different page size required");
|
|
|
|
|
|
for(unsigned int next{}; next < traits_type::page_size; ++next) {
|
|
|
pool.emplace(entt::entity{next});
|
|
|
@@ -664,7 +664,7 @@ TEST(Storage, EmplaceSelfMoveSupportInPlaceDelete) {
|
|
|
|
|
|
TYPED_TEST(Storage, TryEmplace) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
entt::sparse_set &base = pool;
|
|
|
@@ -833,7 +833,7 @@ ENTT_DEBUG_TYPED_TEST(StorageDeathTest, Patch) {
|
|
|
|
|
|
TYPED_TEST(Storage, Insert) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
const std::array entity{entt::entity{1}, entt::entity{3}};
|
|
|
@@ -878,7 +878,7 @@ TYPED_TEST(Storage, Insert) {
|
|
|
|
|
|
TYPED_TEST(Storage, Erase) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
const std::array entity{entt::entity{1}, entt::entity{3}, entt::entity{2}};
|
|
|
@@ -935,7 +935,7 @@ TYPED_TEST(Storage, CrossErase) {
|
|
|
|
|
|
TYPED_TEST(Storage, Remove) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
const std::array entity{entt::entity{1}, entt::entity{3}, entt::entity{2}};
|
|
|
@@ -995,7 +995,7 @@ TYPED_TEST(Storage, CrossRemove) {
|
|
|
|
|
|
TYPED_TEST(Storage, Clear) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
const std::array entity{entt::entity{1}, entt::entity{3}, entt::entity{2}};
|
|
|
@@ -1020,7 +1020,7 @@ TYPED_TEST(Storage, Clear) {
|
|
|
|
|
|
TYPED_TEST(Storage, Compact) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
@@ -1066,7 +1066,7 @@ TYPED_TEST(Storage, Compact) {
|
|
|
|
|
|
TYPED_TEST(Storage, SwapElements) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
|
|
|
@@ -1635,7 +1635,7 @@ ENTT_DEBUG_TEST(StorageDeathTest, NonMovableComponent) {
|
|
|
|
|
|
TYPED_TEST(Storage, CanModifyDuringIteration) {
|
|
|
using value_type = typename TestFixture::type;
|
|
|
- using traits_type = entt::component_traits<value_type>;
|
|
|
+ using traits_type = entt::component_traits_deprecated<value_type>;
|
|
|
|
|
|
entt::storage<value_type> pool;
|
|
|
auto *ptr = &pool.emplace(entt::entity{0}, 2);
|
|
|
@@ -1783,7 +1783,7 @@ TYPED_TEST(Storage, ThrowingAllocator) {
|
|
|
entt::basic_storage<value_type, entt::entity, test::throwing_allocator<value_type>> pool{};
|
|
|
typename std::decay_t<decltype(pool)>::base_type &base = pool;
|
|
|
|
|
|
- constexpr auto packed_page_size = entt::component_traits<value_type>::page_size;
|
|
|
+ constexpr auto packed_page_size = entt::component_traits_deprecated<value_type>::page_size;
|
|
|
constexpr auto sparse_page_size = entt::entt_traits<entt::entity>::page_size;
|
|
|
|
|
|
pool.get_allocator().template throw_counter<value_type>(0u);
|