소스 검색

observer: removed deprecated functions

Michele Caini 5 년 전
부모
커밋
78d43a49c6
2개의 변경된 파일5개의 추가작업 그리고 20개의 파일을 삭제
  1. 0 15
      src/entt/entity/observer.hpp
  2. 5 5
      test/entt/entity/observer.cpp

+ 0 - 15
src/entt/entity/observer.hpp

@@ -64,13 +64,6 @@ struct basic_collector<> {
     static constexpr auto update() ENTT_NOEXCEPT {
         return basic_collector<matcher<type_list<>, type_list<>, AnyOf>>{};
     }
-
-    /*! @copydoc update */
-    template<typename AnyOf>
-    [[deprecated("use ::update instead")]]
-    static constexpr auto replace() ENTT_NOEXCEPT {
-        return update<AnyOf>();
-    }
 };
 
 /**
@@ -107,14 +100,6 @@ struct basic_collector<matcher<type_list<Reject...>, type_list<Require...>, Rule
         return basic_collector<matcher<type_list<>, type_list<>, AnyOf>, current_type, Other...>{};
     }
 
-    /*! @copydoc update */
-    template<typename AnyOf>
-    [[deprecated("use ::update instead")]]
-    static constexpr auto replace() ENTT_NOEXCEPT {
-        return update<AnyOf>();
-    }
-
-
     /**
      * @brief Updates the filter of the last added matcher.
      * @tparam AllOf Types of components required by the matcher.

+ 5 - 5
test/entt/entity/observer.cpp

@@ -134,7 +134,7 @@ TEST(Observer, AllOfFiltered) {
 
 TEST(Observer, Observe) {
     entt::registry registry;
-    entt::observer observer{registry, entt::collector.replace<int>().replace<char>()};
+    entt::observer observer{registry, entt::collector.update<int>().update<char>()};
     const auto entity = registry.create();
 
     ASSERT_TRUE(observer.empty());
@@ -168,7 +168,7 @@ TEST(Observer, Observe) {
 
 TEST(Observer, ObserveFiltered) {
     constexpr auto collector =  entt::collector
-            .replace<int>().where<char>(entt::exclude<double>);
+            .update<int>().where<char>(entt::exclude<double>);
 
     entt::registry registry;
     entt::observer observer{registry, collector};
@@ -215,7 +215,7 @@ TEST(Observer, AllOfObserve) {
     entt::observer observer{};
     const auto entity = registry.create();
 
-    observer.connect(registry, entt::collector.group<int>().replace<char>());
+    observer.connect(registry, entt::collector.group<int>().update<char>());
 
     ASSERT_TRUE(observer.empty());
 
@@ -287,8 +287,8 @@ TEST(Observer, Each) {
 
 TEST(Observer, MultipleFilters) {
     constexpr auto collector =  entt::collector
-            .replace<int>().where<char>()
-            .replace<double>().where<float>();
+            .update<int>().where<char>()
+            .update<double>().where<float>();
 
     entt::registry registry;
     entt::observer observer{registry, collector};