Merge pull request #11692 from vespa-engine/toregge/system-time-and-steady-time-might-have-different-duration-types

std::chrono::system_clock and std::chrono::steady_clock might have different duration types.

3 files changed, 3 insertions, 3 deletions

diff --git a/searchlib/src/vespa/searchlib/engine/trace.cpp b/searchlib/src/vespa/searchlib/engine/trace.cpp
index 2264685ca13..68c614df707 100644
--- a/searchlib/src/vespa/searchlib/engine/trace.cpp
+++ b/searchlib/src/vespa/searchlib/engine/trace.cpp
@@ -41,7 +41,7 @@ Trace::start(int level, bool useUTC) {
         if (useUTC) {
             root().setString("start_time", vespalib::to_string(vespalib::to_utc(_relativeTime.timeOfDawn())));
         } else {
-            root().setString("start_time", vespalib::to_string(vespalib::system_time(_relativeTime.timeOfDawn().time_since_epoch())));
+            root().setString("start_time", vespalib::to_string(vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(_relativeTime.timeOfDawn().time_since_epoch()))));
         }
     }
 }
diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
index e6133496398..1d1edbed658 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
@@ -35,7 +35,7 @@ struct DomainExplorer : vespalib::StateExplorer {
                 {
                     FastOS_StatInfo stat_info;
                     FastOS_File::Stat(part_in.file.c_str(), &stat_info);
-                    part.setString("lastModified", vespalib::to_string(vespalib::system_time(std::chrono::nanoseconds(stat_info._modifiedTimeNS))));
+                    part.setString("lastModified", vespalib::to_string(vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(std::chrono::nanoseconds(stat_info._modifiedTimeNS)))));
                 }
             }
         }
diff --git a/searchlib/src/vespa/searchlib/util/filekit.cpp b/searchlib/src/vespa/searchlib/util/filekit.cpp
index 5cdab1f69e4..6fc0e27d9e3 100644
--- a/searchlib/src/vespa/searchlib/util/filekit.cpp
+++ b/searchlib/src/vespa/searchlib/util/filekit.cpp
@@ -95,7 +95,7 @@ FileKit::getModificationTime(const vespalib::string &name)
 {
     FastOS_StatInfo statInfo;
     if (FastOS_File::Stat(name.c_str(), &statInfo)) {
-        return vespalib::system_time(std::chrono::nanoseconds(statInfo._modifiedTimeNS));
+        return vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(std::chrono::nanoseconds(statInfo._modifiedTimeNS)));
     }
     return vespalib::system_time();
 }