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

Fixed deduction guides for GCC 8.

Browse Source 
The GCC 8 was correctly preffering the deduction guide
syntezied from the std::string_view constructor which is more
specialized than deduction guide. Changed the constructor
so the Duration cannot be deduced from it.
This commit is contained in:
Tomasz Kamiński
2019-08-06 08:32:09 +02:00
committed by Howard Hinnant
parent 1d721d9afd
commit 7c020642fb
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/date/tz.h
View File

@@ -151,6 +151,15 @@ enum class choose {earliest, latest};
namespace detail namespace detail
{ {
struct undocumented; struct undocumented;
template<typename T>
struct nodeduct
{
using type = T;
};
template<typename T>
using nodeduct_t = typename nodeduct<T>::type;
} }
struct sys_info struct sys_info
@@ -447,7 +456,7 @@ public:
sys_time<Duration> sys_time<Duration>
>::value >::value
>::type> >::type>
zoned_time(std::string_view name, const sys_time<Duration>& st); zoned_time(std::string_view name, detail::nodeduct_t<const sys_time<Duration>&> st);
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
@@ -459,7 +468,7 @@ public:
local_time<Duration> local_time<Duration>
>::value >::value
>::type> >::type>
zoned_time(std::string_view name, const local_time<Duration>& tp); zoned_time(std::string_view name, detail::nodeduct_t<const local_time<Duration>&> tp);
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
@@ -472,7 +481,7 @@ public:
choose choose
>::value >::value
>::type> >::type>
zoned_time(std::string_view name, const local_time<Duration>& tp, choose c); zoned_time(std::string_view name, detail::nodeduct_t<const local_time<Duration>&> tp, choose c);
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr, template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
@@ -1448,7 +1457,7 @@ template <class Duration, class TimeZonePtr>
template <class T, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const sys_time<Duration>& st) detail::nodeduct_t<const sys_time<Duration>&> st)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), st) : zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), st)
{} {}
@@ -1456,7 +1465,7 @@ template <class Duration, class TimeZonePtr>
template <class T, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const local_time<Duration>& t) detail::nodeduct_t<const local_time<Duration>&> t)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), t) : zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), t)
{} {}
@@ -1464,7 +1473,7 @@ template <class Duration, class TimeZonePtr>
template <class T, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const local_time<Duration>& t, choose c) detail::nodeduct_t<const local_time<Duration>&> t, choose c)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), t, c) : zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name), t, c)
{} {}