1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff --git a/include/date/tz.h b/include/date/tz.h
index 280a598..f9b5a35 100644
--- a/include/date/tz.h
+++ b/include/date/tz.h
@@ -1963,7 +1963,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
bool is_60_sec = fds.tod.seconds() == seconds{60};
if (is_60_sec)
fds.tod.seconds() -= seconds{1};
- auto tmp = to_utc_time(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
+ auto tmp = utc_clock::from_sys(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
if (is_60_sec)
tmp += seconds{1};
if (is_60_sec != is_leap_second(tmp).first || !fds.tod.in_conventional_range())
@@ -2197,7 +2197,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
return is;
}
-#if !defined(_MSC_VER) || _MSC_VER > 1912
+#if !defined(_MSC_VER) || _MSC_VER > 1913
// clock_time_conversion
@@ -2471,7 +2471,7 @@ clock_cast(const std::chrono::time_point<SrcClock, Duration>& tp)
return clock_cast_detail::cc_impl<DstClock>(tp, &tp);
}
-#endif // !defined(_MSC_VER) || _MSC_VER > 1912
+#endif // !defined(_MSC_VER) || _MSC_VER > 1913
// Deprecated API
@@ -2579,3 +2579,4 @@ to_gps_time(const tai_time<Duration>& t)
} // namespace date
#endif // TZ_H
+
|
