#1516 Fix issue with entity::remove that prevents removing enum compo…

…nents

distr/flecs.h

@@ -25470,23 +25470,12 @@ struct entity_builder : entity_view {
      *
      * @tparam T the type of the component to remove.
      */
-    template <typename T, if_not_t< is_enum<T>::value > = 0>
+    template <typename T>
     const Self& remove() const {
         ecs_remove_id(this->world_, this->id_, _::type<T>::id(this->world_));
         return to_base();
     }
 
-     /** Remove pair for enum.
-     * This operation will remove any `(Enum, *)` pair from the entity.
-     * 
-     * @tparam E The enumeration type.
-     */
-    template <typename E, if_t< is_enum<E>::value > = 0>
-    const Self& remove() const  {
-        flecs::entity_t first = _::type<E>::id(this->world_);
-        return this->remove(first, flecs::Wildcard);
-    }
-
     /** Remove an entity from an entity.
      *
      * @param entity The entity to remove.

examples/cpp/relationships/enum_relations/src/main.cpp

@@ -86,5 +86,5 @@ int main(int, char *[]) {
     //  ::Tile::Sand
 
     // Remove any instance of the TileStatus relationship
-    tile.remove<TileStatus>();
+    tile.remove<TileStatus>(flecs::Wildcard);
 }

include/flecs/addons/cpp/mixins/entity/builder.hpp

@@ -299,23 +299,12 @@ struct entity_builder : entity_view {
      *
      * @tparam T the type of the component to remove.
      */
-    template <typename T, if_not_t< is_enum<T>::value > = 0>
+    template <typename T>
     const Self& remove() const {
         ecs_remove_id(this->world_, this->id_, _::type<T>::id(this->world_));
         return to_base();
     }
 
-     /** Remove pair for enum.
-     * This operation will remove any `(Enum, *)` pair from the entity.
-     * 
-     * @tparam E The enumeration type.
-     */
-    template <typename E, if_t< is_enum<E>::value > = 0>
-    const Self& remove() const  {
-        flecs::entity_t first = _::type<E>::id(this->world_);
-        return this->remove(first, flecs::Wildcard);
-    }
-
     /** Remove an entity from an entity.
      *
      * @param entity The entity to remove.

test/cpp/project.json

@@ -300,7 +300,8 @@
                 "set_pair_second_invalid_type",
                 "get_ref_pair_second_invalid_type",
                 "iter_type",
-                "iter_empty_type"
+                "iter_empty_type",
+                "add_remove_enum_component"
             ]
         }, {
             "id": "Pairs",
@@ -1353,7 +1354,8 @@
                 "add_remove_singleton_pair_R_T",
                 "add_remove_singleton_pair_R_t",
                 "add_remove_singleton_pair_r_t",
-                "get_target"
+                "get_target",
+                "singleton_enum"
             ]
         }, {
             "id": "Misc",

test/cpp/src/Entity.cpp

@@ -4937,3 +4937,33 @@ void Entity_iter_empty_type(void) {
     test_int(count, 0);
 }
 
+enum Color {
+    Red, Green, Blue
+};
+
+void Entity_add_remove_enum_component(void) {
+    flecs::world world;
+
+    flecs::entity e = world.entity();
+
+    e.set<Color>(Blue);
+    test_assert(e.has<Color>());
+
+    {
+        const Color *c = e.get<Color>();
+        test_assert(c != nullptr);
+        test_assert(*c == Blue);
+    }
+
+    e.set<Color>(Green);
+    test_assert(e.has<Color>());
+
+    {
+        const Color *c = e.get<Color>();
+        test_assert(c != nullptr);
+        test_assert(*c == Green);
+    }
+
+    e.remove<Color>();
+    test_assert(!e.has<Color>());
+}

test/cpp/src/Enum.cpp

@@ -597,7 +597,7 @@ void Enum_remove_enum(void) {
     auto e = ecs.entity().add(StandardEnum::Green);
     test_assert(e.has(StandardEnum::Green));
 
-    e.remove<StandardEnum>();
+    e.remove<StandardEnum>(flecs::Wildcard);
     test_assert(!e.has(StandardEnum::Green));
 }
 

test/cpp/src/Singleton.cpp

@@ -329,3 +329,32 @@ void Singleton_get_target(void) {
         test_assert(p == entities[i]);
     }
 }
+
+enum Color {
+    Red, Green, Blue
+};
+
+void Singleton_singleton_enum(void) {
+    flecs::world world;
+
+    world.set<Color>(Blue);
+    test_assert(world.has<Color>());
+
+    {
+        const Color *c = world.get<Color>();
+        test_assert(c != nullptr);
+        test_assert(*c == Blue);
+    }
+
+    world.set<Color>(Green);
+    test_assert(world.has<Color>());
+
+    {
+        const Color *c = world.get<Color>();
+        test_assert(c != nullptr);
+        test_assert(*c == Green);
+    }
+
+    world.remove<Color>();
+    test_assert(!world.has<Color>());
+}

test/cpp/src/Union.cpp

@@ -126,7 +126,7 @@ void Union_switch_enum_type(void) {
     test_assert(e.has<Color>(flecs::Wildcard));
     test_assert(e.table() == table);
 
-    e.remove<Color>();
+    e.remove<Color>(flecs::Wildcard);
     test_assert(!e.has(Red));
     test_assert(!e.has(Green));
     test_assert(!e.has(Blue));

test/cpp/src/main.cpp

@@ -293,6 +293,7 @@ void Entity_set_pair_second_invalid_type(void);
 void Entity_get_ref_pair_second_invalid_type(void);
 void Entity_iter_type(void);
 void Entity_iter_empty_type(void);
+void Entity_add_remove_enum_component(void);
 
 // Testsuite 'Pairs'
 void Pairs_add_component_pair(void);
@@ -1307,6 +1308,7 @@ void Singleton_add_remove_singleton_pair_R_T(void);
 void Singleton_add_remove_singleton_pair_R_t(void);
 void Singleton_add_remove_singleton_pair_r_t(void);
 void Singleton_get_target(void);
+void Singleton_singleton_enum(void);
 
 // Testsuite 'Misc'
 void Misc_setup(void);
@@ -2599,6 +2601,10 @@ bake_test_case Entity_testcases[] = {
     {
         "iter_empty_type",
         Entity_iter_empty_type
+    },
+    {
+        "add_remove_enum_component",
+        Entity_add_remove_enum_component
     }
 };
 
@@ -6561,6 +6567,10 @@ bake_test_case Singleton_testcases[] = {
     {
         "get_target",
         Singleton_get_target
+    },
+    {
+        "singleton_enum",
+        Singleton_singleton_enum
     }
 };
 
@@ -7197,7 +7207,7 @@ static bake_test_suite suites[] = {
         "Entity",
         NULL,
         NULL,
-        280,
+        281,
         Entity_testcases
     },
     {
@@ -7325,7 +7335,7 @@ static bake_test_suite suites[] = {
         "Singleton",
         NULL,
         NULL,
-        20,
+        21,
         Singleton_testcases
     },
     {