X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=1a4274ba3a35c05822ad6f18c43775cf02e592e4;hb=41363aed34382386f915f17c1a961750b4fdcb14;hp=9be491ecbc762bf02046628274d0e6bb91ba445d;hpb=132c0c3cc3fd743943f8b076a122bb052aaf9635;p=libs%2Fcore.git diff --git a/source/time/timedelta.h b/source/time/timedelta.h index 9be491e..1a4274b 100644 --- a/source/time/timedelta.h +++ b/source/time/timedelta.h @@ -1,6 +1,7 @@ #ifndef MSP_TIME_TIMEDELTA_H_ #define MSP_TIME_TIMEDELTA_H_ +#include #include #include #include "rawtime.h" @@ -14,15 +15,14 @@ Represents a quantity of time, such as five seconds. class TimeDelta { private: - RawTime usec; + RawTime usec = 0; public: /** Constructs a zero TimeDelta. */ - TimeDelta(): usec(0) { } + TimeDelta() = default; /** 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. */ + 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 @@ -33,6 +33,7 @@ public: 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 TimeDelta operator*(T a) const { return TimeDelta(RawTime(usec*a)); } @@ -53,7 +54,7 @@ public: bool operator==(const TimeDelta &t) const { return usec==t.usec; } bool operator!=(const TimeDelta &t) const { return usec!=t.usec; } - operator const void *() const { return usec ? this : 0; } + explicit operator bool() const { return usec; } }; template @@ -72,6 +73,9 @@ 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