Avoid generating useless JSON string

arximboldi · May 11, 2024 · a3acbee · a3acbee
1 parent 3e1aec4
commit a3acbee
Show file tree

Hide file tree

Showing 7 changed files with 293 additions and 162 deletions.
diff --git a/immer/extra/archive/json/archivable.hpp b/immer/extra/archive/json/archivable.hpp
@@ -84,14 +84,16 @@ struct archivable
     // }
 };
 
-template <class Storage, class Names, class Container>
+template <class Previous, class Storage, class Names, class Container>
 auto save_minimal(
-    const json_immer_output_archive<detail::archives_save<Storage, Names>>& ar,
+    const json_immer_output_archive<Previous,
+                                    detail::archives_save<Storage, Names>>& ar,
     const archivable<Container>& value)
 {
     auto& save_archive =
         const_cast<
-            json_immer_output_archive<detail::archives_save<Storage, Names>>&>(
+            json_immer_output_archive<Previous,
+                                      detail::archives_save<Storage, Names>>&>(
             ar)
             .get_output_archives()
             .template get_save_archive<Container>();
@@ -110,24 +112,26 @@ auto save_minimal(const json_immer_auto_output_archive<Archive, WrapF>& ar,
 
 // This function must exist because cereal does some checks and it's not
 // possible to have only load_minimal for a type without having save_minimal.
-template <class Storage, class Names, class Container>
+template <class Previous, class Storage, class Names, class Container>
 auto save_minimal(
-    const json_immer_output_archive<detail::archives_load<Storage, Names>>& ar,
+    const json_immer_output_archive<Previous,
+                                    detail::archives_load<Storage, Names>>& ar,
     const archivable<Container>& value) ->
     typename container_traits<Container>::container_id::rep_t
 {
     throw std::logic_error{"Should never be called"};
 }
 
-template <class ImmerArchives, class Container>
+template <class Previous, class ImmerArchives, class Container>
 void load_minimal(
-    const json_immer_input_archive<ImmerArchives>& ar,
+    const json_immer_input_archive<Previous, ImmerArchives>& ar,
     archivable<Container>& value,
     const typename container_traits<Container>::container_id::rep_t& id)
 {
-    auto& loader = const_cast<json_immer_input_archive<ImmerArchives>&>(ar)
-                       .get_input_archives()
-                       .template get_loader<Container>();
+    auto& loader =
+        const_cast<json_immer_input_archive<Previous, ImmerArchives>&>(ar)
+            .get_input_archives()
+            .template get_loader<Container>();
 
     // Have to be specific because for vectors container_id is different from
     // node_id, but for hash-based containers, a container is identified just by