From 2cca52bc4cb39150e29371eec5ab686c75de5d07 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 27 Feb 2017 08:28:45 -0500 Subject: [PATCH] Variant: Reduced dependence on ISO8601 --- src/Variant.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Variant.cpp b/src/Variant.cpp index 69b9aadb3..7e8b38d42 100644 --- a/src/Variant.cpp +++ b/src/Variant.cpp @@ -1002,8 +1002,8 @@ bool Variant::operator_partial (const Variant& other) const case type_date: { left.cast (type_date); - ISO8601d left_date (left._date); - ISO8601d right_date (right._date); + Datetime left_date (left._date); + Datetime right_date (right._date); return left_date.sameDay (right_date); } @@ -1023,8 +1023,8 @@ bool Variant::operator_partial (const Variant& other) const case type_date: { left.cast (type_date); - ISO8601d left_date (left._date); - ISO8601d right_date (right._date); + Datetime left_date (left._date); + Datetime right_date (right._date); return left_date.sameDay (right_date); } @@ -1049,8 +1049,8 @@ bool Variant::operator_partial (const Variant& other) const case type_date: { left.cast (type_date); - ISO8601d left_date (left._date); - ISO8601d right_date (right._date); + Datetime left_date (left._date); + Datetime right_date (right._date); return left_date.sameDay (right_date); } @@ -1095,8 +1095,8 @@ bool Variant::operator_partial (const Variant& other) const return false; left.cast (type_date); - ISO8601d left_date (left._date); - ISO8601d right_date (right._date); + Datetime left_date (left._date); + Datetime right_date (right._date); return left_date.sameDay (right_date); } @@ -1121,8 +1121,8 @@ bool Variant::operator_partial (const Variant& other) const case type_duration: { right.cast (type_date); - ISO8601d left_date (left._date); - ISO8601d right_date (right._date); + Datetime left_date (left._date); + Datetime right_date (right._date); return left_date.sameDay (right_date); } } @@ -1886,7 +1886,7 @@ void Variant::cast (const enum type new_type) if (isop.parse (_string, pos) && pos == _string.length ()) { - _date = ISO8601d ().toEpoch () + isop.toTime_t (); + _date = Datetime ().toEpoch () + isop.toTime_t (); break; }