Add convenience converts among sys_time, utc_time, tai_time, and gps_time.

This commit is contained in:
Howard Hinnant 2016-06-08 20:49:19 -04:00
parent ce4ceb6e9d
commit 8f5e5e4110

54
tz.h
View File

@ -1237,7 +1237,7 @@ gps_clock::utc_to_gps(utc_time<Duration> t)
using namespace std::chrono; using namespace std::chrono;
using duration = typename std::common_type<Duration, seconds>::type; using duration = typename std::common_type<Duration, seconds>::type;
return gps_time<duration>{t.time_since_epoch()} - return gps_time<duration>{t.time_since_epoch()} -
(sys_days{1980_y/jan/6} - sys_days{1970_y/jan/1} + 9s); (sys_days{1980_y/jan/sun[1]} - sys_days{1970_y/jan/1} + 9s);
} }
template <class Duration> template <class Duration>
@ -1247,7 +1247,7 @@ gps_clock::gps_to_utc(gps_time<Duration> t)
using namespace std::chrono; using namespace std::chrono;
using duration = typename std::common_type<Duration, seconds>::type; using duration = typename std::common_type<Duration, seconds>::type;
return utc_time<duration>{t.time_since_epoch()} + return utc_time<duration>{t.time_since_epoch()} +
(sys_days{1980_y/jan/6} - sys_days{1970_y/jan/1} + 9s); (sys_days{1980_y/jan/sun[1]} - sys_days{1970_y/jan/1} + 9s);
} }
template <class Duration> template <class Duration>
@ -1281,10 +1281,58 @@ operator<<(std::basic_ostream<CharT, Traits>& os, const gps_time<Duration>& t)
using namespace std::chrono; using namespace std::chrono;
using duration = typename std::common_type<Duration, seconds>::type; using duration = typename std::common_type<Duration, seconds>::type;
auto tp = sys_time<duration>{t.time_since_epoch()} + auto tp = sys_time<duration>{t.time_since_epoch()} +
(sys_days{1980_y/jan/6} - sys_days{1970_y/jan/1}); (sys_days{1980_y/jan/sun[1]} - sys_days{1970_y/jan/1});
return os << tp; return os << tp;
} }
template <class Duration>
inline
sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_sys_time(tai_time<Duration> t)
{
return to_sys_time(to_utc_time(t));
}
template <class Duration>
inline
sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_sys_time(gps_time<Duration> t)
{
return to_sys_time(to_utc_time(t));
}
template <class Duration>
inline
tai_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_tai_time(sys_time<Duration> t)
{
return to_tai_time(to_utc_time(t));
}
template <class Duration>
inline
tai_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_tai_time(gps_time<Duration> t)
{
return to_tai_time(to_utc_time(t));
}
template <class Duration>
inline
gps_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_gps_time(sys_time<Duration> t)
{
return to_gps_time(to_utc_time(t));
}
template <class Duration>
inline
gps_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_gps_time(tai_time<Duration> t)
{
return to_gps_time(to_utc_time(t));
}
// format // format
namespace detail namespace detail