Commit fca7ac8

author

Charlie Barto

authored

Merge pull request #1550 from BillyONeal/fix_leap_year_last_day

Fix year calculation for the last day of a leap year.

2 parents eb6801f + 198b034 commit fca7ac8Copy full SHA for fca7ac8

File tree

+21

-0

lines changed

Release
- src/utilities
  - asyncrt_utils.cpp
- tests/functional/utils
  - datetime.cpp

+21

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -736,6 +736,12 @@ static compute_year_result compute_year(int64_t secondsSince1900)`
`736`	`736`	`int secondsInt = static_cast<int>(secondsLeft - year4 * SecondsIn4Years);`
`737`	`737`
`738`	`738`	`int year1 = secondsInt / SecondsInYear;`
	`739`	`+ if (year1 == 4)`
	`740`	`+ {`
	`741`	`+ // this is the last day in a leap year`
	`742`	`+ year1 = 3;`
	`743`	`+ }`
	`744`	`+`
`739`	`745`	`secondsInt -= year1 * SecondsInYear;`
`740`	`746`
`741`	`747`	`// shift back to 1900 base from 1601:`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,21 @@ SUITE(datetime)`
`133`	`133`	`TestDateTimeRoundtrip(_XPLATSTR("9999年12月31日T23:59:59Z"));`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ TEST(parsing_time_roundtrip_year_2016)`
	`137`	`+ {`
	`138`	`+ TestDateTimeRoundtrip(_XPLATSTR("2016年12月31日T20:59:59Z"));`
	`139`	`+ }`
	`140`	`+`
	`141`	`+ TEST(parsing_time_roundtrip_year_2020)`
	`142`	`+ {`
	`143`	`+ TestDateTimeRoundtrip(_XPLATSTR("2020年12月31日T20:59:59Z"));`
	`144`	`+ }`
	`145`	`+`
	`146`	`+ TEST(parsing_time_roundtrip_year_2021)`
	`147`	`+ {`
	`148`	`+ TestDateTimeRoundtrip(_XPLATSTR("2021年01月01日T20:59:59Z"));`
	`149`	`+ }`
	`150`	`+`
`136`	`151`	`TEST(emitting_time_correct_day) {`
`137`	`152`	`const auto test = utility::datetime() + UINT64_C(132004507640000000); // 2019年04月22日T23:52:44 is a Monday`
`138`	`153`	`const auto actual = test.to_string(utility::datetime::RFC_1123);`

Comments

(0)