Correct registration of RepeatDateTime serialisation ECFLOW-1992

ecmwf · Nov 29, 2024 · a36bea6 · a36bea6
2 parents 66aadf8 + 009cf50
commit a36bea6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/libs/attribute/src/ecflow/attribute/RepeatAttr.cpp b/libs/attribute/src/ecflow/attribute/RepeatAttr.cpp
@@ -1779,6 +1779,7 @@ bool RepeatDay::operator==(const RepeatDay& rhs) const {
     }
     return true;
 }
+
 // =========================================================================================
 
 template <class Archive>
@@ -1840,6 +1841,7 @@ void Repeat::serialize(Archive& ar, std::uint32_t const version) {
 
 CEREAL_TEMPLATE_SPECIALIZE(RepeatBase);
 CEREAL_TEMPLATE_SPECIALIZE_V(RepeatDate);
+CEREAL_TEMPLATE_SPECIALIZE_V(RepeatDateTime);
 CEREAL_TEMPLATE_SPECIALIZE_V(RepeatDateList);
 CEREAL_TEMPLATE_SPECIALIZE_V(RepeatInteger);
 CEREAL_TEMPLATE_SPECIALIZE_V(RepeatEnumerated);
@@ -1848,6 +1850,7 @@ CEREAL_TEMPLATE_SPECIALIZE_V(RepeatDay);
 CEREAL_TEMPLATE_SPECIALIZE_V(Repeat);
 
 CEREAL_REGISTER_TYPE(RepeatDate)
+CEREAL_REGISTER_TYPE(RepeatDateTime)
 CEREAL_REGISTER_TYPE(RepeatDateList)
 CEREAL_REGISTER_TYPE(RepeatInteger)
 CEREAL_REGISTER_TYPE(RepeatEnumerated)

diff --git a/libs/core/src/ecflow/core/Chrono.cpp b/libs/core/src/ecflow/core/Chrono.cpp
@@ -17,6 +17,8 @@
 
 #include <boost/lexical_cast.hpp>
 
+#include "ecflow/core/Serialization.hpp"
+
 namespace ecf {
 
 namespace {
@@ -237,4 +239,17 @@ bool operator>=(const Duration& rhs, const Duration& lhs) {
     return !(rhs < lhs);
 }
 
+template <class Archive>
+void Instant::serialize(Archive& ar, std::uint32_t const version) {
+    ar(instant_);
+}
+
+template <class Archive>
+void Duration::serialize(Archive& ar, std::uint32_t const version) {
+    ar(duration_);
+}
+
+CEREAL_TEMPLATE_SPECIALIZE_V(Instant);
+CEREAL_TEMPLATE_SPECIALIZE_V(Duration);
+
 } // namespace ecf
diff --git a/libs/core/src/ecflow/core/Chrono.hpp b/libs/core/src/ecflow/core/Chrono.hpp
@@ -14,6 +14,10 @@
 #include <chrono>
 #include <string>
 
+namespace cereal {
+class access;
+}
+
 namespace ecf {
 
 class Instant;
@@ -47,6 +51,10 @@ class Instant {
 
 private:
     instant_t instant_;
+
+    friend class cereal::access;
+    template <class Archive>
+    void serialize(Archive& ar, std::uint32_t const version);
 };
 
 std::ostream& operator<<(std::ostream& o, const Instant& v);
@@ -76,6 +84,10 @@ class Duration {
 
 private:
     duration_t duration_;
+
+    friend class cereal::access;
+    template <class Archive>
+    void serialize(Archive& ar, std::uint32_t const version);
 };
 
 std::ostream& operator<<(std::ostream& o, const Duration& v);

diff --git a/libs/core/src/ecflow/core/Serialization.hpp b/libs/core/src/ecflow/core/Serialization.hpp
@@ -20,6 +20,7 @@
 #include <string>
 
 #include <cereal/archives/json.hpp>
+#include <cereal/types/chrono.hpp>
 #include <cereal/types/deque.hpp>
 #include <cereal/types/map.hpp>
 #include <cereal/types/memory.hpp>