feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Allow heterogeneous zoned_time constructors

Browse Source 
taking {string_view, zoned_time}
This commit is contained in:
Howard Hinnant
2018-04-21 17:45:52 -04:00
parent 9d0bcdb63f
commit c665992a6e
2 changed files with 111 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/date/ptz.h
View File

@ -393,7 +393,7 @@ throw_invalid(const string_t& s, unsigned i, const string_t& message)
{
throw std::runtime_error(std::string("Invalid time_zone initializer.\n") +
std::string(message) + ":\n" +
s + '\n' +
std::string(s) + '\n' +
"\x1b[1;32m" +
std::string(i, '~') + '^' +
std::string(s.size()-i-1, '~') +

185
include/date/tz.h
View File

@ -474,30 +474,34 @@ public:
>::type>
zoned_time(std::string_view name, const local_time<Duration>& tp, choose c);
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string_view())),
zoned_time
>::value
>::type>
zoned_time(std::string_view name, const zoned_time& zt);
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string_view())),
zoned_time
>::value
>::type>
zoned_time(std::string_view name, const zoned_time<Duration2, TimeZonePtr2>& zt);
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string_view())),
zoned_time,
choose
>::value
>::type>
zoned_time(std::string_view name, const zoned_time& zt, choose);
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string_view())),
zoned_time,
choose
>::value
>::type>
zoned_time(std::string_view name, const zoned_time<Duration2, TimeZonePtr2>& zt, choose);
#else // !HAS_STRING_VIEW
@ -588,62 +592,80 @@ public:
zoned_time(const char* name, const local_time<Duration>& tp, choose c);
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time
>::value
>::type>
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time
>::value
>::type>
#else
template <class Duration2, class TimeZonePtr2>
#endif
zoned_time(const std::string& name, const zoned_time& zt);
zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time
>::value
>::type>
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time
>::value
>::type>
#else
template <class Duration2, class TimeZonePtr2>
#endif
zoned_time(const char* name, const zoned_time& zt);
zoned_time(const char* name, const zoned_time<Duration2, TimeZonePtr2>& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time,
choose
>::value
>::type>
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time,
choose
>::value
>::type>
#else
template <class Duration2, class TimeZonePtr2>
#endif
zoned_time(const std::string& name, const zoned_time& zt, choose);
zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt,
choose);
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr,
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if
<
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time,
choose
>::value
>::type>
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value &&
std::is_constructible
<
zoned_time,
decltype(zoned_traits<T>::locate_zone(std::string())),
zoned_time,
choose
>::value
>::type>
#else
template <class Duration2, class TimeZonePtr2>
#endif
zoned_time(const char* name, const zoned_time& zt, choose);
zoned_time(const char* name, const zoned_time<Duration2, TimeZonePtr2>& zt,
choose);
#endif // !HAS_STRING_VIEW
@ -1465,17 +1487,19 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
{}
template <class Duration, class TimeZonePtr>
template <class, class>
template <class Duration2, class TimeZonePtr2, class, class>
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, const zoned_time& zt)
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const zoned_time<Duration2, TimeZonePtr2>& zt)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt)
{}
template <class Duration, class TimeZonePtr>
template <class, class>
template <class Duration2, class TimeZonePtr2, class, class>
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const zoned_time& zt, choose c)
const zoned_time<Duration2, TimeZonePtr2>& zt,
choose c)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt, c)
{}
@ -1543,40 +1567,51 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class>
template <class Duration2, class TimeZonePtr2, class, class>
#else
template <class Duration2, class TimeZonePtr2>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
const zoned_time& zt)
const zoned_time<Duration2, TimeZonePtr2>& zt)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt)
{}
template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class>
template <class Duration2, class TimeZonePtr2, class, class>
#else
template <class Duration2, class TimeZonePtr2>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, const zoned_time& zt)
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
const zoned_time<Duration2, TimeZonePtr2>& zt)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt)
{}
template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class>
template <class Duration2, class TimeZonePtr2, class, class>
#else
template <class Duration2, class TimeZonePtr2>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
const zoned_time& zt, choose c)
const zoned_time<Duration2, TimeZonePtr2>& zt,
choose c)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt, c)
{}
template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class>
template <class Duration2, class TimeZonePtr2, class, class>
#else
template <class Duration2, class TimeZonePtr2>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
const zoned_time& zt, choose c)
const zoned_time<Duration2, TimeZonePtr2>& zt,
choose c)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), zt, c)
{}