X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=1a4274ba3a35c05822ad6f18c43775cf02e592e4;hp=c73529b0e3f8a9c7ea60bdcc215ce105050643fc;hb=9990be018b49e5aae27218e1b8c6aefdb63b38a7;hpb=b4806214e905752617691f851717033fd3f266c2 diff --git a/source/time/timedelta.h b/source/time/timedelta.h index c73529b..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,11 +15,11 @@ 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. */ @@ -32,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)); } @@ -52,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 @@ -71,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