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

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

Browse Source
This commit is contained in:
Sascha Zelzer
2016-09-15 15:41:08 +02: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

2
date.h
View File

@@ -2769,7 +2769,7 @@ year_month_weekday::ok() const NOEXCEPT
return false; return false;
if (wdi_.index() <= 4) if (wdi_.index() <= 4)
return true; return true;
auto d2 = wdi_.weekday() - date::weekday(y_/m_/1) + days((wdi_.index()-1)*7 + 1); auto d2 = wdi_.weekday() - date::weekday(static_cast<sys_days>(y_/m_/1)) + days((wdi_.index()-1)*7 + 1);
return static_cast<unsigned>(d2.count()) <= static_cast<unsigned>((y_/m_/last).day()); return static_cast<unsigned>(d2.count()) <= static_cast<unsigned>((y_/m_/last).day());
} }

8
tz.cpp
View File

@@ -926,7 +926,7 @@ MonthDayTime::to_sys_days(date::year y) const
case lteq: case lteq:
{ {
auto const x = y/u.month_day_weekday_.month_day_; 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 wd0 = u.month_day_weekday_.weekday_;
return sys_days(x) - (wd1-wd0); 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 x = y/u.month_day_weekday_.month_day_;
auto const wd1 = u.month_day_weekday_.weekday_; 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); return sys_days(x) + (wd1-wd0);
} }
@@ -965,7 +965,7 @@ MonthDayTime::canonicalize(date::year y)
case lteq: case lteq:
{ {
auto const x = y/u.month_day_weekday_.month_day_; 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 wd0 = u.month_day_weekday_.weekday_;
auto const ymd = year_month_day(sys_days(x) - (wd1-wd0)); auto const ymd = year_month_day(sys_days(x) - (wd1-wd0));
u.month_day_ = ymd.month()/ymd.day(); 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 x = y/u.month_day_weekday_.month_day_;
auto const wd1 = u.month_day_weekday_.weekday_; 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)); auto const ymd = year_month_day(sys_days(x) + (wd1-wd0));
u.month_day_ = ymd.month()/ymd.day(); u.month_day_ = ymd.month()/ymd.day();
type_ = month_day; type_ = month_day;