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

Some backwards compatibility fixes for VS-2013

Browse Source
This commit is contained in:
Howard Hinnant
2018-06-12 18:13:24 -04:00
parent af2b2b70b3
commit d50970b32a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/date/date.h
View File

@@ -4453,7 +4453,7 @@ extract_weekday(std::basic_ostream<CharT, Traits>& os, const fields<Duration>& f
weekday wd; weekday wd;
if (fds.ymd.ok()) if (fds.ymd.ok())
{ {
wd = weekday{fds.ymd}; wd = weekday{sys_days(fds.ymd)};
if (fds.wd.ok() && wd != fds.wd) if (fds.wd.ok() && wd != fds.wd)
{ {
// fds.ymd and fds.wd are inconsistent // fds.ymd and fds.wd are inconsistent
@@ -7332,8 +7332,8 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
if (ymd.ok()) if (ymd.ok())
{ {
if (wd == not_a_weekday) if (wd == not_a_weekday)
wd = static_cast<int>((weekday(ymd) - Sunday).count()); wd = static_cast<int>((weekday(sys_days(ymd)) - Sunday).count());
else if (wd != static_cast<int>((weekday(ymd) - Sunday).count())) else if (wd != static_cast<int>((weekday(sys_days(ymd)) - Sunday).count()))
goto broken; goto broken;
if (!computed) if (!computed)
{ {