X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=ad985c7e2c1d13a7a738237c9d9f3af33c4b7212;hb=3fd9d04e84cdd72aabe8f9878f9e8ff006275bb6;hp=97c8cac03adf5020fb8e168d11d89c37fb653997;hpb=f6147f00575bdf6e6b53c2ab81161f5f73d0ab84;p=libs%2Fcore.git diff --git a/source/time/timedelta.h b/source/time/timedelta.h index 97c8cac..ad985c7 100644 --- a/source/time/timedelta.h +++ b/source/time/timedelta.h @@ -6,7 +6,6 @@ Distributed under the LGPL #ifndef MSP_TIME_TIMEDELTA_H_ #define MSP_TIME_TIMEDELTA_H_ -#include #include #include #include "types.h" @@ -52,14 +51,14 @@ public: TimeDelta &operator-=(const TimeDelta &t) { usec-=t.usec; return *this; } template - TimeDelta operator*(T a) const { return TimeDelta(int64_t(usec*a)); } + TimeDelta operator*(T a) const { return TimeDelta(RawTime(usec*a)); } template - TimeDelta &operator*=(T a) { usec=int64_t(usec*a); return *this; } + TimeDelta &operator*=(T a) { usec=RawTime(usec*a); return *this; } template - TimeDelta operator/(T a) const { return TimeDelta(int64_t(usec/a)); } + TimeDelta operator/(T a) const { return TimeDelta(RawTime(usec/a)); } template - TimeDelta &operator/=(T a) { usec=int64_t(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; } @@ -70,7 +69,7 @@ public: bool operator==(const TimeDelta &t) const { return usec==t.usec; } bool operator!=(const TimeDelta &t) const { return usec!=t.usec; } - operator bool() const { return usec; } + operator const void *() const { return usec ? this : 0; } private: RawTime usec; };