3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 00:14:07 +08:00
Code Issues Projects Releases Wiki Activity

Restored deprecated to_clock_time function.

Browse Source 
Fixed the to_utc_time(const gps_time<Duration>& t) function
to correctly use clock_cast<utc_time>.

Added test to deprecated functions.
This commit is contained in:
Tomasz Kamiński 2017-11-24 23:34:19 +01:00
parent d4592bd497
commit b13c859ff1
2 changed files with 203 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
include/date/tz.h
View File

@ -2417,6 +2417,107 @@ auto clock_cast(const std::chrono::time_point<SourceClock, Duration>& st)
return clock_cast_detail::cc_impl<DestClock>(st, &st);
}
// Deprecated API
template <class Duration>
inline
sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_sys_time(const utc_time<Duration>& t)
{
return clock_cast<std::chrono::system_clock>(t);
}
template <class Duration>
inline
sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_sys_time(const tai_time<Duration>& t)
{
return clock_cast<std::chrono::system_clock>(t);
}
template <class Duration>
inline
sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_sys_time(const gps_time<Duration>& t)
{
return clock_cast<std::chrono::system_clock>(t);
}
template <class Duration>
inline
utc_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_utc_time(const sys_time<Duration>& t)
{
return clock_cast<utc_clock>(t);
}
template <class Duration>
inline
utc_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_utc_time(const tai_time<Duration>& t)
{
return clock_cast<utc_clock>(t);
}
template <class Duration>
inline
utc_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_utc_time(const gps_time<Duration>& t)
{
return clock_cast<utc_clock>(t);
}
template <class Duration>
inline
tai_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_tai_time(const sys_time<Duration>& t)
{
return clock_cast<tai_clock>(t);
}
template <class Duration>
inline
tai_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_tai_time(const utc_time<Duration>& t)
{
return clock_cast<tai_clock>(t);
}
template <class Duration>
inline
tai_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_tai_time(const gps_time<Duration>& t)
{
return clock_cast<tai_clock>(t);
}
template <class Duration>
inline
gps_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_gps_time(const sys_time<Duration>& t)
{
return clock_cast<gps_clock>(t);
}
template <class Duration>
inline
gps_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_gps_time(const utc_time<Duration>& t)
{
return clock_cast<gps_clock>(t);
}
template <class Duration>
inline
gps_time<typename std::common_type<Duration, std::chrono::seconds>::type>
to_gps_time(const tai_time<Duration>& t)
{
return clock_cast<gps_clock>(t);
}
#endif // !MISSING_LEAP_SECONDS
} // namespace date

102
test/clock_cast_test/deprecated.pass.cpp Normal file
View File

@ -0,0 +1,102 @@
// The MIT License (MIT)
//
// Copyright (c) 2017 Tomasz Kamiński
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "tz.h"
#include <cassert>
int
main()
{
using namespace date;
using sys_clock = std::chrono::system_clock;
// self
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto tt = tai_clock::from_utc(ut);
assert(clock_cast<sys_clock>(st) == st);
assert(clock_cast<utc_clock>(ut) == ut);
assert(clock_cast<tai_clock>(tt) == tt);
}
// sys <-> utc
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
assert(clock_cast<utc_clock>(st) == ut);
assert(clock_cast<sys_clock>(ut) == st);
}
// tai <-> utc
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto tt = tai_clock::from_utc(ut);
assert(clock_cast<tai_clock>(ut) == tt);
assert(clock_cast<utc_clock>(tt) == ut);
}
// tai <-> sys
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto tt = tai_clock::from_utc(ut);
assert(clock_cast<tai_clock>(st) == tt);
assert(clock_cast<sys_clock>(tt) == st);
}
// gps <-> utc
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto gt = gps_clock::from_utc(ut);
assert(clock_cast<gps_clock>(ut) == gt);
assert(clock_cast<utc_clock>(gt) == ut);
}
// gps <-> sys
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto gt = gps_clock::from_utc(ut);
assert(clock_cast<gps_clock>(st) == gt);
assert(clock_cast<sys_clock>(gt) == st);
}
// tai <-> gps
{
sys_days st(1997_y/dec/12);
auto ut = utc_clock::from_sys(st);
auto tt = tai_clock::from_utc(ut);
auto gt = gps_clock::from_utc(ut);
assert(clock_cast<gps_clock>(tt) == gt);
assert(clock_cast<tai_clock>(gt) == tt);
}
}