summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-06 13:58:40 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-06 13:58:40 +0000
commit6e386e9c9aa38b69ca99eb750c5b9f46fd426c61 (patch)
treeaac9bbf181f83695f1c7053d85cd444e8cd26e6c
parentc4aeb31ab5e5add3eda9af95259058a3a3868099 (diff)
Be xplicit.
-rw-r--r--searchlib/src/vespa/searchlib/util/filekit.cpp2
-rw-r--r--staging_vespalib/src/tests/benchmark/testbase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/searchlib/src/vespa/searchlib/util/filekit.cpp b/searchlib/src/vespa/searchlib/util/filekit.cpp
index 4a48609ac9c..5cdab1f69e4 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(vespalib::duration(statInfo._modifiedTimeNS));
+ return vespalib::system_time(std::chrono::nanoseconds(statInfo._modifiedTimeNS));
}
return vespalib::system_time();
}
diff --git a/staging_vespalib/src/tests/benchmark/testbase.cpp b/staging_vespalib/src/tests/benchmark/testbase.cpp
index e3f1434c7d6..eb714039ef5 100644
--- a/staging_vespalib/src/tests/benchmark/testbase.cpp
+++ b/staging_vespalib/src/tests/benchmark/testbase.cpp
@@ -171,7 +171,7 @@ size_t ClockSystem::onRun()
for (size_t i=0; i < 1000; i++) {
end = vespalib::system_clock::now();
}
- return (start - end).count();
+ return std::chrono::duration_cast<std::chrono::nanoseconds>(start - end).count();
}
size_t ClockREALTIME::onRun()