Move non-oneliner functions out of RefPtr class declaration

[libs/core.git] / source / time / timedelta.h

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index c290f260a7600fd3bbb5d0de80512187bbae8b6d..2ce6eeb4e9e42d3d48db4a6d908d0c18c480810c 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,7 +1,8 @@
 #ifndef MSP_TIME_TIMEDELTA_H_
 #define MSP_TIME_TIMEDELTA_H_
 
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <msp/strings/lexicalcast.h>
 #include "rawtime.h"
 
@@ -17,61 +18,64 @@ private:
        RawTime usec;
 
 public:
-       /**
-       Constructs a zero TimeDelta.
-       */
+       /** Constructs a zero TimeDelta. */
        TimeDelta(): usec(0) { }
 
-       /**
-       Constructs a TimeDelta from a plain number.  The purpose of this is to allow
-       serialization together with the raw() function.  For creating TimeDeltas
-       with a specific length, see units.h.
-       */
+       /** Constructs a TimeDelta from a plain number.  The purpose of this is to
+       allow serialization together with the raw() function. */
        explicit TimeDelta(RawTime u): usec(u) { }
 
-       /**
-       Returns the raw number stored inside the TimeDelta.  This should only be used
-       for serialization and the result should not be interpreted in any way.
-       */
+       /** Returns the raw number stored inside the TimeDelta.  This should only be used
+       for serialization and the result should not be interpreted in any way. */
        RawTime raw() const { return usec; }
 
-       TimeDelta operator+(const TimeDelta &t) const  { return TimeDelta(usec+t.usec); }
-       TimeDelta &operator+=(const TimeDelta &t)      { usec+=t.usec; return *this; }
-       TimeDelta operator-(const TimeDelta &t) const  { return TimeDelta(usec-t.usec); }
-       TimeDelta &operator-=(const TimeDelta &t)      { usec-=t.usec; return *this; }
+       TimeDelta operator+(const TimeDelta &t) const { return TimeDelta(usec+t.usec); }
+       TimeDelta &operator+=(const TimeDelta &t) { usec += t.usec; return *this; }
+       TimeDelta operator-(const TimeDelta &t) const { return TimeDelta(usec-t.usec); }
+       TimeDelta &operator-=(const TimeDelta &t) { usec -= t.usec; return *this; }
+       TimeDelta operator-() const { return TimeDelta(-usec); }
 
        template<typename T>
-       TimeDelta operator*(T a) const                 { return TimeDelta(RawTime(usec*a)); }
+       TimeDelta operator*(T a) const { return TimeDelta(RawTime(usec*a)); }
        template<typename T>
-       TimeDelta &operator*=(T a)                     { usec=RawTime(usec*a); return *this; }
+       TimeDelta &operator*=(T a) { usec = RawTime(usec*a); return *this; }
 
        template<typename T>
-       TimeDelta operator/(T a) const                 { return TimeDelta(RawTime(usec/a)); }
+       TimeDelta operator/(T a) const { return TimeDelta(RawTime(usec/a)); }
        template<typename T>
-       TimeDelta &operator/=(T a)                     { usec=RawTime(usec/a); return *this; }
+       TimeDelta &operator/=(T a) { usec = RawTime(usec/a); return *this; }
 
-       double    operator/(const TimeDelta &t) const  { return double(usec)/t.usec; }
+       double operator/(const TimeDelta &t) const { return double(usec)/t.usec; }
 
-       bool      operator>(const TimeDelta &t) const  { return usec>t.usec; }
-       bool      operator>=(const TimeDelta &t) const { return usec>=t.usec; }
-       bool      operator<(const TimeDelta &t) const  { return usec<t.usec; }
-       bool      operator<=(const TimeDelta &t) const { return usec<=t.usec; }
-       bool      operator==(const TimeDelta &t) const { return usec==t.usec; }
-       bool      operator!=(const TimeDelta &t) const { return usec!=t.usec; }
+       bool operator>(const TimeDelta &t) const { return usec>t.usec; }
+       bool operator>=(const TimeDelta &t) const { return usec>=t.usec; }
+       bool operator<(const TimeDelta &t) const { return usec<t.usec; }
+       bool operator<=(const TimeDelta &t) const { return usec<=t.usec; }
+       bool operator==(const TimeDelta &t) const { return usec==t.usec; }
+       bool operator!=(const TimeDelta &t) const { return usec!=t.usec; }
 
-#ifndef WIN32
-       operator timeval() const { return rawtime_to_timeval(usec); }
-       operator timespec() const { return rawtime_to_timespec(usec); }
-#endif
-
-       operator const void *() const                  { return usec ? this : 0; }
+       operator const void *() const { return usec ? this : 0; }
 };
 
 template<typename T>
-inline TimeDelta operator*(T a, const TimeDelta &t)   { return t*a; }
+inline TimeDelta operator*(T a, const TimeDelta &t) { return t*a; }
 
 void operator<<(LexicalConverter &, const TimeDelta &);
 
+
+// Constants to be used in creation of TimeDeltas
+extern const TimeDelta zero;
+extern const TimeDelta usec;
+extern const TimeDelta msec;
+extern const TimeDelta sec;
+extern const TimeDelta min;
+extern const TimeDelta hour;
+extern const TimeDelta day;
+extern const TimeDelta week;
+
+inline TimeDelta abs(const TimeDelta &t) { return t>=zero ? t : -t; }
+using std::abs;
+
 } // namespace Time
 } // namespace Msp