diff --git a/include/date/tz.h b/include/date/tz.h index c3dbf84..2bbc01e 100644 --- a/include/date/tz.h +++ b/include/date/tz.h @@ -2197,8 +2197,6 @@ from_stream(std::basic_istream& is, const CharT* fmt, return is; } -#if !defined(_MSC_VER) || _MSC_VER > 1913 - // clock_time_conversion template @@ -2438,7 +2436,8 @@ cc_impl(const time_point& t, const void*) template auto cc_impl(const time_point& t, const void*) - -> decltype(conv_clock(conv_clock(t))) + -> decltype(0, // MSVC_WORKAROUND + conv_clock(conv_clock(t))) { return conv_clock(conv_clock(t)); } @@ -2456,7 +2455,8 @@ cc_impl(const time_point& t, ...) template auto cc_impl(const time_point& t, ...) - -> decltype(conv_clock(conv_clock(conv_clock(t)))) + -> decltype(0, // MSVC_WORKAROUND + conv_clock(conv_clock(conv_clock(t)))) { return conv_clock(conv_clock(conv_clock(t))); } @@ -2471,8 +2471,6 @@ clock_cast(const std::chrono::time_point& tp) return clock_cast_detail::cc_impl(tp, &tp); } -#endif // !defined(_MSC_VER) || _MSC_VER > 1913 - // Deprecated API template