generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

[SF 2804457] DateTime::checkLimit looks wrong

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2009-06-15 22:23:41 +00:00
parent 5245543642
commit 29bd22fe69
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Foundation/include/Poco/DateTime.h
View File

@@ -427,6 +427,16 @@ inline void swap(DateTime& d1, DateTime& d2)
} }
inline void DateTime::checkLimit(short& lower, short& higher, short limit)
{
if (lower >= limit)
{
higher += short(lower / limit);
lower = short(lower % limit);
}
}
} // namespace Poco } // namespace Poco

20
Foundation/src/DateTime.cpp
View File

@@ -335,23 +335,13 @@ double DateTime::toJulianDay(int year, int month, int day, int hour, int minute,
} }
void DateTime::checkLimit(short& lower, short& higher, short limit)
{
if (lower > limit)
{
higher += short(lower / limit);
lower = short((lower % limit) - 1);
}
}
void DateTime::normalize() void DateTime::normalize()
{ {
checkLimit(_microsecond, _millisecond, 999); checkLimit(_microsecond, _millisecond, 1000);
checkLimit(_millisecond, _second, 999); checkLimit(_millisecond, _second, 1000);
checkLimit(_second, _minute, 59); checkLimit(_second, _minute, 60);
checkLimit(_minute, _hour, 59); checkLimit(_minute, _hour, 60);
checkLimit(_hour, _day, 23); checkLimit(_hour, _day, 24);
if (_day > daysOfMonth(_year, _month)) if (_day > daysOfMonth(_year, _month))
{ {