HowardHinnant/date
1
0
Fork 1
mirror of https://github.com/HowardHinnant/date.git synced 2025-08-01 19:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow zoned_time with coarser precision than seconds

Browse Source 
*  This gives greater interoperability with the deduction for class
   templates language feature.

*  time_points output from zoned_time still have at least seconds
   precision.
This commit is contained in:
Howard Hinnant
2017-06-13 23:00:54 -04:00
parent ec412a1de0
commit 1139c9b64f
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tz.h
View File

@@ -273,8 +273,12 @@ class time_zone;
template <class Duration> template <class Duration>
class zoned_time class zoned_time
{ {
public:
using duration = typename std::common_type<Duration, std::chrono::seconds>::type;
private:
const time_zone* zone_; const time_zone* zone_;
sys_time<Duration> tp_; sys_time<duration> tp_;
public: public:
zoned_time(const sys_time<Duration>& st); zoned_time(const sys_time<Duration>& st);
@@ -310,12 +314,12 @@ public:
zoned_time& operator=(const sys_time<Duration>& st); zoned_time& operator=(const sys_time<Duration>& st);
zoned_time& operator=(const local_time<Duration>& ut); zoned_time& operator=(const local_time<Duration>& ut);
operator sys_time<Duration>() const; operator sys_time<duration>() const;
explicit operator local_time<Duration>() const; explicit operator local_time<duration>() const;
const time_zone* get_time_zone() const; const time_zone* get_time_zone() const;
local_time<Duration> get_local_time() const; local_time<duration> get_local_time() const;
sys_time<Duration> get_sys_time() const; sys_time<duration> get_sys_time() const;
sys_info get_info() const; sys_info get_info() const;
template <class Duration1, class Duration2> template <class Duration1, class Duration2>
@@ -330,9 +334,6 @@ public:
private: private:
template <class D> friend class zoned_time; template <class D> friend class zoned_time;
static_assert(std::is_convertible<std::chrono::seconds, Duration>::value,
"zoned_time must have a precision of seconds or finer");
}; };
using zoned_seconds = zoned_time<std::chrono::seconds>; using zoned_seconds = zoned_time<std::chrono::seconds>;
@@ -971,14 +972,14 @@ zoned_time<Duration>::operator=(const local_time<Duration>& ut)
template <class Duration> template <class Duration>
inline inline
zoned_time<Duration>::operator local_time<Duration>() const zoned_time<Duration>::operator local_time<duration>() const
{ {
return get_local_time(); return get_local_time();
} }
template <class Duration> template <class Duration>
inline inline
zoned_time<Duration>::operator sys_time<Duration>() const zoned_time<Duration>::operator sys_time<duration>() const
{ {
return get_sys_time(); return get_sys_time();
} }
@@ -993,7 +994,7 @@ zoned_time<Duration>::get_time_zone() const
template <class Duration> template <class Duration>
inline inline
local_time<Duration> local_time<typename zoned_time<Duration>::duration>
zoned_time<Duration>::get_local_time() const zoned_time<Duration>::get_local_time() const
{ {
return zone_->to_local(tp_); return zone_->to_local(tp_);
@@ -1001,7 +1002,7 @@ zoned_time<Duration>::get_local_time() const
template <class Duration> template <class Duration>
inline inline
sys_time<Duration> sys_time<typename zoned_time<Duration>::duration>
zoned_time<Duration>::get_sys_time() const zoned_time<Duration>::get_sys_time() const
{ {
return tp_; return tp_;