aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/time.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-02-25 23:07:38 +0000
committerlloyd <[email protected]>2010-02-25 23:07:38 +0000
commit5fec937bd0c72858d6cf2f09b58b219294c7d5cc (patch)
tree811714c0663199782b07b8f20a328eeeeff9e768 /src/utils/time.cpp
parent08647db8877585a783797c8db22dc76233b200f0 (diff)
parent3e95540b28f3d828c4578381c318545f6ad49589 (diff)
propagate from branch 'net.randombit.botan' (head c1db52e38b60afbc6549af5222d6e10b1b9730dd)
to branch 'net.randombit.botan.c++0x' (head e56dfbfe6bffbd5b4e52b115549d885c5fd04586)
Diffstat (limited to 'src/utils/time.cpp')
-rw-r--r--src/utils/time.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index fe4521706..77ad0eec5 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -47,7 +47,7 @@ u64bit combine_timers(u32bit seconds, u32bit parts, u32bit parts_hz)
return res;
}
-std::tm do_gmtime(time_t time_val)
+std::tm do_gmtime(std::time_t time_val)
{
std::tm tm;
@@ -67,20 +67,13 @@ std::tm do_gmtime(time_t time_val)
}
-/**
-* Get the system clock
-*/
-u64bit system_time()
- {
- return static_cast<u64bit>(std::time(0));
- }
-
/*
* Convert a time_point to a calendar_point
*/
-calendar_point calendar_value(u64bit a_time_t)
+calendar_point calendar_value(
+ const std::chrono::system_clock::time_point& time_point)
{
- std::tm tm = do_gmtime(static_cast<std::time_t>(a_time_t));
+ std::tm tm = do_gmtime(std::chrono::system_clock::to_time_t(time_point));
return calendar_point(tm.tm_year + 1900,
tm.tm_mon + 1,