X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimestamp.h;h=2905c6ed5d23ad150172db2bc0b5f7ee0883cd50;hb=3fd9d04e84cdd72aabe8f9878f9e8ff006275bb6;hp=da4e457f8b1be6be0c4aa619274c81be80b183dc;hpb=e1ea831a640fba534e7e42e399f04cdf681ef8d3;p=libs%2Fcore.git

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index da4e457..2905c6e 100644
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -1,21 +1,22 @@
 /*
-This file is part of libmspframework     
+This file is part of libmspcore     
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 #ifndef MSP_TIME_TIMESTAMP_H_
 #define MSP_TIME_TIMESTAMP_H_
 
-#include <stdint.h>
 #include "timedelta.h"
+#include "types.h"
 
 namespace Msp {
 namespace Time {
 
 /**
-Represents a moment in time, such as the last tick.  This class is NOT intended
-to be used for storing arbitary user-defined times, I'll add a DateTime class
-if the need arises.
+Represents a moment in time.  The main source of TimeStamps is the now()
+function.
+
+For representing user-specified times, use the DateTime class.
 */
 class TimeStamp
 {
@@ -30,13 +31,13 @@ public:
 	Constructs a TimeStamp from a plain number.  The purpose of this is to allow
 	serialization together with the raw() function.
 	*/
-	explicit TimeStamp(int64_t u): usec(u) { }
+	explicit TimeStamp(RawTime u): usec(u) { }
 
 	/**
-	Returns the raw number stored inside the TimeStamp.  This should only be used
-	for serialization and the result should not be interpreted in any way.
+	Returns the raw number stored inside the TimeStamp.  This value should be
+	considered opaque and only be used for serialization.
 	*/
-	int64_t   raw() const { return usec; }
+	RawTime raw() const { return usec; }
 
 	TimeStamp operator+(const TimeDelta &t) const  { return TimeStamp(usec+t.raw()); }
 	TimeStamp &operator+=(const TimeDelta &t)      { usec+=t.raw(); return *this; }
@@ -49,11 +50,11 @@ public:
 	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 bool() const                          { return usec>0; }
+	operator const void *() const                  { return usec>0 ? this : 0; }
 
 	static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 private:
-	int64_t usec;
+	RawTime usec;
 };
 
 } // namespace Time