From bf0bde8a649d3df8acaeb488c30988d16c548d36 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 24 Oct 2024 08:31:41 +0200 Subject: [PATCH] organizer: drop deprecated members --- src/entt/entity/organizer.hpp | 8 -------- test/entt/entity/organizer.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/entt/entity/organizer.hpp b/src/entt/entity/organizer.hpp index f8fbcea42..2e5c64c24 100644 --- a/src/entt/entity/organizer.hpp +++ b/src/entt/entity/organizer.hpp @@ -272,14 +272,6 @@ public: return out; } - /** - * @brief Returns the list of nodes reachable from a given vertex. - * @return The list of nodes reachable from the vertex. - */ - [[deprecated("use ::out_edges")]] [[nodiscard]] const std::vector &children() const noexcept { - return out_edges(); - } - /** * @brief Prepares a registry and assures that all required resources * are properly instantiated before using them. diff --git a/test/entt/entity/organizer.cpp b/test/entt/entity/organizer.cpp index b114e8866..6978a3c9f 100644 --- a/test/entt/entity/organizer.cpp +++ b/test/entt/entity/organizer.cpp @@ -82,7 +82,7 @@ TEST(Organizer, EmplaceFreeFunction) { ASSERT_EQ(graph[0u].out_edges()[0u], 1u); ASSERT_EQ(graph[0u].out_edges()[1u], 2u); ASSERT_EQ(graph[1u].out_edges()[0u], 3u); - ASSERT_EQ(graph[2u].children()[0u], 3u); // NOLINT + ASSERT_EQ(graph[2u].out_edges()[0u], 3u); for(auto &&vertex: graph) { typename entt::organizer::function_type *cb = vertex.callback(); @@ -148,7 +148,7 @@ TEST(Organizer, EmplaceMemberFunction) { ASSERT_EQ(graph[0u].out_edges()[0u], 1u); ASSERT_EQ(graph[1u].out_edges()[0u], 2u); - ASSERT_EQ(graph[2u].children()[0u], 3u); // NOLINT + ASSERT_EQ(graph[2u].out_edges()[0u], 3u); for(auto &&vertex: graph) { typename entt::organizer::function_type *cb = vertex.callback(); @@ -221,7 +221,7 @@ TEST(Organizer, EmplaceFreeFunctionWithPayload) { ASSERT_EQ(graph[0u].out_edges()[0u], 4u); ASSERT_EQ(graph[1u].out_edges()[0u], 4u); ASSERT_EQ(graph[2u].out_edges()[0u], 3u); - ASSERT_EQ(graph[3u].children()[0u], 4u); // NOLINT + ASSERT_EQ(graph[3u].out_edges()[0u], 4u); for(auto &&vertex: graph) { typename entt::organizer::function_type *cb = vertex.callback(); @@ -303,7 +303,7 @@ TEST(Organizer, EmplaceDirectFunction) { ASSERT_EQ(graph[0u].out_edges()[0u], 1u); ASSERT_EQ(graph[1u].out_edges()[0u], 2u); - ASSERT_EQ(graph[2u].children()[0u], 3u); // NOLINT + ASSERT_EQ(graph[2u].out_edges()[0u], 3u); for(auto &&vertex: graph) { typename entt::organizer::function_type *cb = vertex.callback(); @@ -370,7 +370,7 @@ TEST(Organizer, SyncPoint) { ASSERT_EQ(graph[1u].out_edges()[1u], 3u); ASSERT_EQ(graph[2u].out_edges()[0u], 4u); ASSERT_EQ(graph[3u].out_edges()[0u], 4u); - ASSERT_EQ(graph[4u].children()[0u], 5u); // NOLINT + ASSERT_EQ(graph[4u].out_edges()[0u], 5u); for(auto &&vertex: graph) { typename entt::organizer::function_type *cb = vertex.callback(); @@ -407,7 +407,7 @@ TEST(Organizer, Override) { ASSERT_EQ(graph[2u].out_edges().size(), 0u); ASSERT_EQ(graph[0u].out_edges()[0u], 2u); - ASSERT_EQ(graph[1u].children()[0u], 2u); // NOLINT + ASSERT_EQ(graph[1u].out_edges()[0u], 2u); } TEST(Organizer, Prepare) {