From e12f7c66f0b8c554298dc0c82c3d41e2c4b4c53b Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Tue, 7 Nov 2017 13:01:16 -0700 Subject: [PATCH] Unconstrain make_zoned for VS-2015 --- include/date/tz.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/include/date/tz.h b/include/date/tz.h index 9c3f8da..d85d6f9 100644 --- a/include/date/tz.h +++ b/include/date/tz.h @@ -1674,8 +1674,9 @@ make_zoned(const sys_time& tp) return zoned_time::type>(tp); } -template 1900) + , class = typename std::enable_if < std::is_class < @@ -1685,6 +1686,7 @@ template ::type >{} >::type +#endif > inline zoned_time @@ -1700,11 +1702,13 @@ make_zoned(const std::string& name) return zoned_seconds(name); } -template 1900) + , class = typename std::enable_if < std::is_class())>::type>{} >::type +#endif > inline zoned_time::type, TimeZonePtr> @@ -1714,11 +1718,13 @@ make_zoned(TimeZonePtr zone, const local_time& tp) TimeZonePtr>(std::move(zone), tp); } -template 1900) + , class = typename std::enable_if < std::is_class())>::type>{} >::type +#endif > inline zoned_time::type, TimeZonePtr> @@ -1778,11 +1784,13 @@ make_zoned(const std::string& name, const zoned_time& zt, return zoned_time(name, zt, c); } -template 1900) + , class = typename std::enable_if < std::is_class())>::type>{} >::type +#endif > inline zoned_time::type, TimeZonePtr>