X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimestamp.h;h=8068510a6647b00d739fba0d98cf31f5da4bbac8;hp=db3587a253e915787aa6f643e80d02124b6f49cc;hb=9990be018b49e5aae27218e1b8c6aefdb63b38a7;hpb=5889d53f8f073ff0e1e1ebbd786abecd8352a7b3

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index db3587a..8068510 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMESTAMP_H_
 #define MSP_TIME_TIMESTAMP_H_
 
 #include "timedelta.h"
-#include "types.h"
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -23,43 +16,37 @@ For representing user-specified times, use the DateTime class.
 class TimeStamp
 {
 private:
-	RawTime usec;
+	RawTime usec = 0;
 
 public:
-	/**
-	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) { }
+	/** Construct a TimeStamp that represents an arbitarily distant point in the
+	past.  It's guaranteed to be less than any valid timestamp. */
+	TimeStamp() = default;
 
-	/**
-	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() { return usec/1000000LL; }
+	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<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>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!=t.usec; }
 
-	operator const void *() const                  { return usec>0 ? this : 0; }
+	explicit operator bool() const { return usec>0; }
 
 	static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 };