X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimestamp.h;h=1317b26bc0ba067c7774ef9ecfd6fb7342e2bdff;hp=cb38279501ff7e0026aca3e1e23a890ab843fcea;hb=be8ea216d23bf36bdfb2d3e302638782575fc136;hpb=967785734be5c3fc6f75da122c2d93ebbb338271 diff --git a/source/time/timestamp.h b/source/time/timestamp.h index cb38279..1317b26 100644 --- a/source/time/timestamp.h +++ b/source/time/timestamp.h @@ -19,45 +19,34 @@ private: RawTime usec; public: - /** - Construct a TimeStamp that represents an arbitarily distant point in the - past. It's guaranteed to be less than any valid timestamp. - */ + /** Construct a TimeStamp that represents an arbitarily distant point in the + past. It's guaranteed to be less than any valid timestamp. */ TimeStamp(): usec(0) { } - /** - Constructs a TimeStamp from a plain number. The purpose of this is to allow - serialization together with the raw() function. - */ + /** Constructs a TimeStamp from a plain number. The purpose of this is to allow + serialization together with the raw() function. */ explicit TimeStamp(RawTime u): usec(u) { } - /** - Returns the raw number stored inside the TimeStamp. This value should be - considered opaque and only be used for serialization. - */ + /** Returns the raw number stored inside the TimeStamp. This value should be + considered opaque and only be used for serialization. */ RawTime raw() const { return usec; } time_t to_unixtime() const { return usec/1000000LL; } - TimeStamp operator+(const TimeDelta &t) const { return TimeStamp(usec+t.raw()); } - TimeStamp &operator+=(const TimeDelta &t) { usec+=t.raw(); return *this; } - TimeStamp operator-(const TimeDelta &t) const { return TimeStamp(usec-t.raw()); } - TimeStamp &operator-=(const TimeDelta &t) { usec-=t.raw(); return *this; } - TimeDelta operator-(const TimeStamp &t) const { return TimeDelta(usec-t.usec); } + TimeStamp operator+(const TimeDelta &t) const { return TimeStamp(usec+t.raw()); } + TimeStamp &operator+=(const TimeDelta &t) { usec += t.raw(); return *this; } + TimeStamp operator-(const TimeDelta &t) const { return TimeStamp(usec-t.raw()); } + TimeStamp &operator-=(const TimeDelta &t) { usec -= t.raw(); return *this; } + TimeDelta operator-(const TimeStamp &t) const { return TimeDelta(usec-t.usec); } - bool operator>=(const TimeStamp &t) const { return usec>=t.usec; } - bool operator>(const TimeStamp &t) const { return usec>t.usec; } - bool operator<=(const TimeStamp &t) const { return usec<=t.usec; } - bool operator<(const TimeStamp &t) const { return usec=(const TimeStamp &t) const { return usec>=t.usec; } + bool operator>(const TimeStamp &t) const { return usec>t.usec; } + bool operator<=(const TimeStamp &t) const { return usec<=t.usec; } + bool operator<(const TimeStamp &t) const { return usec0 ? this : 0; } - -#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>0 ? this : 0; } static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); } };