Add move semantics to Variant

[libs/core.git] / source / time / datetime.cpp

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index e1abcf7da81aade456c90ce6f438fd61ea2958c7..e011f3b2ac0b8a3681048bd1c59e17194dbda03c 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -29,7 +29,7 @@ inline unsigned char month_days(int y, unsigned char m)
 }
 
 template<typename T>
-inline int cmp_(T a, T b)
+inline int _cmp(T a, T b)
 {
        if(a<b)
                return -1;
@@ -45,52 +45,32 @@ namespace Time {
 
 DateTime::DateTime(const TimeStamp &ts)
 {
-       init(ts);
+       add_raw(ts.raw());
 }
 
-DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz)
+DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz):
+       DateTime(ts)
 {
-       init(ts);
        convert_timezone(tz);
 }
 
-DateTime::DateTime(int y, unsigned char m, unsigned char d)
-{
-       init(y, m, d, 0, 0, 0, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s)
+DateTime::DateTime(int y, unsigned char m, unsigned char d):
+       DateTime(y, m, d, 0, 0, 0, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s):
+       DateTime(y, m, d, h, n, s, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u):
+       year(y),
+       month(m),
+       mday(d),
+       hour(h),
+       minute(n),
+       second(s),
+       usec(u)
 {
-       init(y, m, d, h, n, s, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
-       init(y, m, d, h, n, s, u);
-}
-
-void DateTime::init(const TimeStamp &ts)
-{
-       year = 1970;
-       month = 1;
-       mday = 1;
-       hour = 0;
-       minute = 0;
-       second = 0;
-       usec = 0;
-       add_raw(ts.raw());
-}
-
-void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
-       year = y;
-       month = m;
-       mday = d;
-       hour = h;
-       minute = n;
-       second = s;
-       usec = u;
-
        if(usec>=1000000)
                throw out_of_range("DateTime::DateTime usec");
        if(second>=60)
@@ -251,19 +231,19 @@ DateTime &DateTime::operator-=(const TimeDelta &td)
 
 int DateTime::cmp(const DateTime &dt) const
 {
-       if(int c = cmp_(year, dt.year))
+       if(int c = _cmp(year, dt.year))
                return c;
-       if(int c = cmp_(month, dt.month))
+       if(int c = _cmp(month, dt.month))
                return c;
-       if(int c = cmp_(mday, dt.mday))
+       if(int c = _cmp(mday, dt.mday))
                return c;
-       if(int c = cmp_(hour, dt.hour))
+       if(int c = _cmp(hour, dt.hour))
                return c;
-       if(int c = cmp_(minute, dt.minute))
+       if(int c = _cmp(minute, dt.minute))
                return c;
-       if(int c = cmp_(second, dt.second))
+       if(int c = _cmp(second, dt.second))
                return c;
-       if(int c = cmp_(usec, dt.usec))
+       if(int c = _cmp(usec, dt.usec))
                return c;
        return 0;
 }