From 340ec6689179c04f6e6e494b8d12ef96c5be3e3b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 17 Dec 2016 21:56:18 -0500 Subject: [PATCH] Dates: Migrated from ISO8601d to Datetime --- src/Dates.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Dates.cpp b/src/Dates.cpp index 1cb4273f0..5fc17e25d 100644 --- a/src/Dates.cpp +++ b/src/Dates.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -38,14 +38,14 @@ //////////////////////////////////////////////////////////////////////////////// static bool isMonth (const std::string& name, int& i) { - i = ISO8601d::monthOfYear (name) - 1; + i = Datetime::monthOfYear (name) - 1; return i != -2 ? true : false; } //////////////////////////////////////////////////////////////////////////////// static bool isDay (const std::string& name, int& i) { - i = ISO8601d::dayOfWeek (name); + i = Datetime::dayOfWeek (name); return i != -1 ? true : false; } @@ -303,7 +303,7 @@ bool namedDates (const std::string& name, Variant& value) t->tm_hour = 24; t->tm_min = 0; t->tm_sec = -1; - t->tm_mday = ISO8601d::daysInMonth (t->tm_mon + 1, t->tm_year + 1900); + t->tm_mday = Datetime::daysInMonth (t->tm_year + 1900, t->tm_mon + 1); t->tm_isdst = -1; value = Variant (mktime (t), Variant::type_date); } @@ -415,7 +415,7 @@ bool namedDates (const std::string& name, Variant& value) // If it is this month. if (d < number && - number <= ISO8601d::daysInMonth (m, y)) + number <= Datetime::daysInMonth (y, m)) { t->tm_hour = t->tm_min = t->tm_sec = 0; t->tm_mon = m - 1;