gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Dates: Converted from Date::daysInMonth to ISO8601d::daysInMonth

Browse Source
This commit is contained in:
Paul Beckingham
2015-09-26 14:12:23 -04:00
parent 18804a743c
commit d351c9faf2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Dates.cpp
View File

@@ -30,6 +30,7 @@
#include <time.h> #include <time.h>
#include <text.h> #include <text.h>
#include <Dates.h> #include <Dates.h>
#include <ISO8601.h>
#include <Date.h> #include <Date.h>
#include <Lexer.h> #include <Lexer.h>
#include <CLI2.h> #include <CLI2.h>
@@ -302,7 +303,7 @@ bool namedDates (const std::string& name, Variant& value)
t->tm_hour = 24; t->tm_hour = 24;
t->tm_min = 0; t->tm_min = 0;
t->tm_sec = -1; t->tm_sec = -1;
t->tm_mday = Date::daysInMonth (t->tm_mon + 1, t->tm_year + 1900); t->tm_mday = ISO8601d::daysInMonth (t->tm_mon + 1, t->tm_year + 1900);
t->tm_isdst = -1; t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date); value = Variant (mktime (t), Variant::type_date);
} }
@@ -414,7 +415,7 @@ bool namedDates (const std::string& name, Variant& value)
// If it is this month. // If it is this month.
if (d < number && if (d < number &&
number <= Date::daysInMonth (m, y)) number <= ISO8601d::daysInMonth (m, y))
{ {
t->tm_hour = t->tm_min = t->tm_sec = 0; t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_mon = m - 1; t->tm_mon = m - 1;