X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=a6c7005b9a35639875e36d85cc6d5b97ed169b5c;hb=6af098355f2b037a6f8084f9f6c741e462ffa614;hp=2ce6eeb4e9e42d3d48db4a6d908d0c18c480810c;hpb=ab9e61f0bc6ed09dae52f538dc6927c54b9216df;p=libs%2Fcore.git diff --git a/source/time/timedelta.h b/source/time/timedelta.h index 2ce6eeb..a6c7005 100644 --- a/source/time/timedelta.h +++ b/source/time/timedelta.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "rawtime.h" @@ -12,14 +13,14 @@ namespace Time { /** Represents a quantity of time, such as five seconds. */ -class TimeDelta +class MSPCORE_API 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. */ @@ -54,24 +55,24 @@ 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 inline TimeDelta operator*(T a, const TimeDelta &t) { return t*a; } -void operator<<(LexicalConverter &, const TimeDelta &); +MSPCORE_API 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; +MSPCORE_API extern const TimeDelta zero; +MSPCORE_API extern const TimeDelta usec; +MSPCORE_API extern const TimeDelta msec; +MSPCORE_API extern const TimeDelta sec; +MSPCORE_API extern const TimeDelta min; +MSPCORE_API extern const TimeDelta hour; +MSPCORE_API extern const TimeDelta day; +MSPCORE_API extern const TimeDelta week; inline TimeDelta abs(const TimeDelta &t) { return t>=zero ? t : -t; } using std::abs;