mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-03 18:19:38 -06:00
Second merge fix
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user