ISO8601d: Renamed ::_value to ::_date

This commit is contained in:
Paul Beckingham 2015-09-26 12:26:09 -04:00
parent 5eb9948235
commit eeb592d032
3 changed files with 18 additions and 18 deletions

View file

@ -109,7 +109,7 @@ static struct
ISO8601d::ISO8601d ()
{
clear ();
_value = time (NULL);
_date = time (NULL);
}
////////////////////////////////////////////////////////////////////////////////
@ -120,7 +120,7 @@ ISO8601d::~ISO8601d ()
////////////////////////////////////////////////////////////////////////////////
ISO8601d::operator time_t () const
{
return _value;
return _date;
}
////////////////////////////////////////////////////////////////////////////////
@ -209,7 +209,7 @@ void ISO8601d::clear ()
_seconds = 0;
_offset = 0;
_utc = false;
_value = 0;
_date = 0;
}
////////////////////////////////////////////////////////////////////////////////
@ -579,7 +579,7 @@ void ISO8601d::resolve ()
t.tm_min = (seconds % 3600) / 60;
t.tm_sec = seconds % 60;
_value = utc ? timegm (&t) : mktime (&t);
_date = utc ? timegm (&t) : mktime (&t);
}
////////////////////////////////////////////////////////////////////////////////

View file

@ -64,7 +64,7 @@ public:
int _seconds;
int _offset;
bool _utc;
time_t _value;
time_t _date;
};
// Period

View file

@ -47,25 +47,25 @@ void testParse (
int in_seconds,
int in_offset,
bool in_utc,
time_t in_value)
time_t in_date)
{
std::string label = std::string ("parse (\"") + input + "\") --> ";
ISO8601d iso;
std::string::size_type start = 0;
t.ok (iso.parse (input, start), label + "true");
t.is ((int) start, in_start, label + "[]");
t.is (iso._year, in_year, label + "_year");
t.is (iso._month, in_month, label + "_month");
t.is (iso._week, in_week, label + "_week");
t.is (iso._weekday, in_weekday, label + "_weekday");
t.is (iso._julian, in_julian, label + "_julian");
t.is (iso._day, in_day, label + "_day");
t.is (iso._seconds, in_seconds, label + "_seconds");
t.is (iso._offset, in_offset, label + "_offset");
t.is (iso._utc, in_utc, label + "_utc");
t.is ((size_t) iso._value, (size_t) in_value, label + "_value");
t.ok (iso.parse (input, start), label + "true");
t.is ((int) start, in_start, label + "[]");
t.is (iso._year, in_year, label + "_year");
t.is (iso._month, in_month, label + "_month");
t.is (iso._week, in_week, label + "_week");
t.is (iso._weekday, in_weekday, label + "_weekday");
t.is (iso._julian, in_julian, label + "_julian");
t.is (iso._day, in_day, label + "_day");
t.is (iso._seconds, in_seconds, label + "_seconds");
t.is (iso._offset, in_offset, label + "_offset");
t.is (iso._utc, in_utc, label + "_utc");
t.is ((size_t) iso._date, (size_t) in_date, label + "_date");
}
////////////////////////////////////////////////////////////////////////////////