diff options
| author | Vincent Richard <[email protected]> | 2005-04-23 09:03:10 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2005-04-23 09:03:10 +0000 |
| commit | 02391f3f02ba4725d2cf2d94e5fef3d8761364d9 (patch) | |
| tree | d7cc85bcaea5a83021ccc7fd4e32a10ef6458141 /src/dateTime.cpp | |
| parent | Fixed date/time comparisons. (diff) | |
| download | vmime-02391f3f02ba4725d2cf2d94e5fef3d8761364d9.tar.gz vmime-02391f3f02ba4725d2cf2d94e5fef3d8761364d9.zip | |
Added unit tests for date comparison + fixed date comparison (again...).
Diffstat (limited to 'src/dateTime.cpp')
| -rw-r--r-- | src/dateTime.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/dateTime.cpp b/src/dateTime.cpp index d2f0d5b6..d2807a2a 100644 --- a/src/dateTime.cpp +++ b/src/dateTime.cpp @@ -793,12 +793,12 @@ const bool datetime::operator<(const datetime& other) const const datetime ut1 = utility::datetimeUtils::localTimeToUniversalTime(*this); const datetime ut2 = utility::datetimeUtils::localTimeToUniversalTime(other); - return ((ut1.m_year < ut2.m_year) || - (ut1.m_year == ut2.m_year && ut1.m_month < ut2.m_month) || - (ut1.m_month == ut2.m_month && ut1.m_day < ut2.m_day) || - (ut1.m_day == ut2.m_day && ut1.m_hour < ut2.m_hour) || - (ut1.m_hour == ut2.m_hour && ut1.m_minute < ut2.m_minute) || - (ut1.m_minute == ut2.m_minute && ut1.m_second < ut2.m_second)); + return ((ut1.m_year < ut2.m_year) || + ((ut1.m_year == ut2.m_year) && ((ut1.m_month < ut2.m_month) || + ((ut1.m_month == ut2.m_month) && ((ut1.m_day < ut2.m_day) || + ((ut1.m_day == ut2.m_day) && ((ut1.m_hour < ut2.m_hour) || + ((ut1.m_hour == ut2.m_hour) && ((ut1.m_minute < ut2.m_minute) || + ((ut1.m_minute == ut2.m_minute) && ((ut1.m_second < ut2.m_second)))))))))))); } @@ -807,12 +807,12 @@ const bool datetime::operator<=(const datetime& other) const const datetime ut1 = utility::datetimeUtils::localTimeToUniversalTime(*this); const datetime ut2 = utility::datetimeUtils::localTimeToUniversalTime(other); - return ((ut1.m_year < ut2.m_year) || - (ut1.m_year == ut2.m_year && ut1.m_month < ut2.m_month) || - (ut1.m_month == ut2.m_month && ut1.m_day < ut2.m_day) || - (ut1.m_day == ut2.m_day && ut1.m_hour < ut2.m_hour) || - (ut1.m_hour == ut2.m_hour && ut1.m_minute < ut2.m_minute) || - (ut1.m_minute == ut2.m_minute && ut1.m_second <= ut2.m_second)); + return ((ut1.m_year < ut2.m_year) || + ((ut1.m_year == ut2.m_year) && ((ut1.m_month < ut2.m_month) || + ((ut1.m_month == ut2.m_month) && ((ut1.m_day < ut2.m_day) || + ((ut1.m_day == ut2.m_day) && ((ut1.m_hour < ut2.m_hour) || + ((ut1.m_hour == ut2.m_hour) && ((ut1.m_minute < ut2.m_minute) || + ((ut1.m_minute == ut2.m_minute) && ((ut1.m_second <= ut2.m_second)))))))))))); } @@ -821,12 +821,12 @@ const bool datetime::operator>(const datetime& other) const const datetime ut1 = utility::datetimeUtils::localTimeToUniversalTime(*this); const datetime ut2 = utility::datetimeUtils::localTimeToUniversalTime(other); - return ((ut1.m_year > ut2.m_year) || - (ut1.m_year == ut2.m_year && ut1.m_month > ut2.m_month) || - (ut1.m_month == ut2.m_month && ut1.m_day > ut2.m_day) || - (ut1.m_day == ut2.m_day && ut1.m_hour > ut2.m_hour) || - (ut1.m_hour == ut2.m_hour && ut1.m_minute > ut2.m_minute) || - (ut1.m_minute == ut2.m_minute && ut1.m_second > ut2.m_second)); + return ((ut1.m_year > ut2.m_year) || + ((ut1.m_year == ut2.m_year) && ((ut1.m_month > ut2.m_month) || + ((ut1.m_month == ut2.m_month) && ((ut1.m_day > ut2.m_day) || + ((ut1.m_day == ut2.m_day) && ((ut1.m_hour > ut2.m_hour) || + ((ut1.m_hour == ut2.m_hour) && ((ut1.m_minute > ut2.m_minute) || + ((ut1.m_minute == ut2.m_minute) && (ut1.m_second > ut2.m_second))))))))))); } @@ -835,12 +835,12 @@ const bool datetime::operator>=(const datetime& other) const const datetime ut1 = utility::datetimeUtils::localTimeToUniversalTime(*this); const datetime ut2 = utility::datetimeUtils::localTimeToUniversalTime(other); - return ((ut1.m_year > ut2.m_year) || - (ut1.m_year == ut2.m_year && ut1.m_month > ut2.m_month) || - (ut1.m_month == ut2.m_month && ut1.m_day > ut2.m_day) || - (ut1.m_day == ut2.m_day && ut1.m_hour > ut2.m_hour) || - (ut1.m_hour == ut2.m_hour && ut1.m_minute > ut2.m_minute) || - (ut1.m_minute == ut2.m_minute && ut1.m_second >= ut2.m_second)); + return ((ut1.m_year > ut2.m_year) || + ((ut1.m_year == ut2.m_year) && ((ut1.m_month > ut2.m_month) || + ((ut1.m_month == ut2.m_month) && ((ut1.m_day > ut2.m_day) || + ((ut1.m_day == ut2.m_day) && ((ut1.m_hour > ut2.m_hour) || + ((ut1.m_hour == ut2.m_hour) && ((ut1.m_minute > ut2.m_minute) || + ((ut1.m_minute == ut2.m_minute) && (ut1.m_second >= ut2.m_second))))))))))); } |