feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Work around a compiler bug in VS2013 with explicit conversion constructors.

Browse Source
This commit is contained in:
Sascha Zelzer
2016-09-15 20:10:04 -04:00
committed by Howard Hinnant
parent 570a1e699c
commit 553affefa4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tz.cpp
+4 -4
View File
@@ -926,7 +926,7 @@ MonthDayTime::to_sys_days(date::year y) const
case lteq:
{
auto const x = y/u.month_day_weekday_.month_day_;
auto const wd1 = weekday(x);
auto const wd1 = weekday(static_cast<sys_days>(x));
auto const wd0 = u.month_day_weekday_.weekday_;
return sys_days(x) - (wd1-wd0);
}
@@ -935,7 +935,7 @@ MonthDayTime::to_sys_days(date::year y) const
}
auto const x = y/u.month_day_weekday_.month_day_;
auto const wd1 = u.month_day_weekday_.weekday_;
auto const wd0 = weekday(x);
auto const wd0 = weekday(static_cast<sys_days>(x));
return sys_days(x) + (wd1-wd0);
}
@@ -965,7 +965,7 @@ MonthDayTime::canonicalize(date::year y)
case lteq:
{
auto const x = y/u.month_day_weekday_.month_day_;
auto const wd1 = weekday(x);
auto const wd1 = weekday(static_cast<sys_days>(x));
auto const wd0 = u.month_day_weekday_.weekday_;
auto const ymd = year_month_day(sys_days(x) - (wd1-wd0));
u.month_day_ = ymd.month()/ymd.day();
@@ -976,7 +976,7 @@ MonthDayTime::canonicalize(date::year y)
{
auto const x = y/u.month_day_weekday_.month_day_;
auto const wd1 = u.month_day_weekday_.weekday_;
auto const wd0 = weekday(x);
auto const wd0 = weekday(static_cast<sys_days>(x));
auto const ymd = year_month_day(sys_days(x) + (wd1-wd0));
u.month_day_ = ymd.month()/ymd.day();
type_ = month_day;