From 60a981f03d531f365c69f25877239ffe48bc14c3 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 28 May 2011 16:37:04 +0300 Subject: [PATCH] Change exception classes and messages in DateTime --- source/time/datetime.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp index 13fba63..23d0f2a 100644 --- a/source/time/datetime.cpp +++ b/source/time/datetime.cpp @@ -8,7 +8,7 @@ Distributed under the LGPL #include #include #include -#include "../core/except.h" +#include #include "datetime.h" #include "timestamp.h" #include "units.h" @@ -100,17 +100,17 @@ void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, un usec = u; if(usec>=1000000) - throw InvalidParameterValue("Microseconds out of range"); + throw out_of_range("DateTime::DateTime usec"); if(second>=60) - throw InvalidParameterValue("Seconds out of range"); + throw out_of_range("DateTime::DateTime second"); if(minute>=60) - throw InvalidParameterValue("Minutes out of range"); + throw out_of_range("DateTime::DateTime minute"); if(hour>=24) - throw InvalidParameterValue("Hours out of range"); + throw out_of_range("DateTime::DateTime hour"); if(month<1 || month>12) - throw InvalidParameterValue("Month out of range"); + throw out_of_range("DateTime::DateTime month"); if(mday<1 || mday>month_days(year, month)) - throw InvalidParameterValue("Day of month out of range"); + throw out_of_range("DateTime::DateTime mday"); } void DateTime::add_days(int days) @@ -239,7 +239,7 @@ int DateTime::cmp(const DateTime &dt) const TimeStamp DateTime::get_timestamp() const { if(year<-289701 || year>293641) - throw InvalidState("DateTime is not representable as a TimeStamp"); + throw range_error("DateTime::get_timestamp"); RawTime raw = (((hour*60LL)+minute)*60+second)*1000000+usec; int days = (year-1970)*365; -- 2.43.0