Allow forcing tree cache updates.

alialib · Jun 8, 2020 · 82c8938 · 82c8938
1 parent 8cbd4d7
commit 82c8938
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/alia/flow/object_trees.hpp b/src/alia/flow/object_trees.hpp
@@ -239,9 +239,10 @@ struct scoped_tree_cacher
     scoped_tree_cacher(
         tree_traversal<Object>& traversal,
         tree_caching_data<Object>& data,
-        id_interface const& content_id)
+        id_interface const& content_id,
+        bool force_update)
     {
-        begin(traversal, data, content_id);
+        begin(traversal, data, content_id, force_update);
     }
     ~scoped_tree_cacher()
     {
@@ -253,11 +254,12 @@ struct scoped_tree_cacher
     begin(
         tree_traversal<Object>& traversal,
         tree_caching_data<Object>& data,
-        id_interface const& content_id)
+        id_interface const& content_id,
+        bool force_update)
     {
         traversal_ = &traversal;
         data_ = &data;
-        content_traversal_required_ = false;
+        content_traversal_required_ = force_update;
 
         // If the content ID changes, we know we have to refresh the contents.
         if (!data.content_id.matches(content_id))

diff --git a/unit_tests/flow/object_trees.cpp b/unit_tests/flow/object_trees.cpp
@@ -563,7 +563,7 @@ TEST_CASE("object tree caching", "[flow][object_trees]")
         auto& caching_data
             = get_cached_data<tree_caching_data<test_object>>(ctx);
         scoped_tree_cacher<test_object> cacher(
-            get<tree_traversal_tag>(ctx), caching_data, make_id(n & 12));
+            get<tree_traversal_tag>(ctx), caching_data, make_id(n & 12), false);
         ALIA_EVENT_DEPENDENT_IF(cacher.content_traversal_required())
         {
             the_log << "traversing cached content; ";