From 2e191b6bd27caa2b8a58ef1a0f59ae8faa4062e5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 17 Mar 2025 11:42:57 +0100
Subject: [PATCH] Second merge fix

---
 modules/space/rotation/spicerotation.cpp       | 3 +++
 modules/space/translation/spicetranslation.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 6d426bb2d1..f582fa32e1 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -86,6 +86,9 @@ namespace {
 
         // [[codegen::verbatim(FixedDateInfo.description)]]
         std::optional<std::string> fixedDate [[codegen::datetime()]];
+
+        // [[codegen::verbatim(TimeOffsetInfo.description)]]
+        std::optional<float> timeOffset;
     };
 #include "spicerotation_codegen.cpp"
 } // namespace
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index dcc1213eba..1439043cea 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -106,7 +106,7 @@ namespace {
             [[codegen::annotation("A valid SPICE NAIF name for a reference frame")]];
 
         // [[codegen::verbatim(FixedDateInfo.description)]]
-        std::optional<std::string> fixedDate;
+        std::optional<std::string> fixedDate [[codegen::datetime()]];
 
         // [[codegen::verbatim(TimeOffsetInfo.description)]]
         std::optional<float> timeOffset;