X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimedelta.h;h=a4595e6680e05ac8185b3e7273ec4acad8cc3136;hb=bb49a2de46849a9ffa509148661d4c574c43fe24;hp=96dc7604f48e3b8ccca9ace1eeeae8cdc7fcff99;hpb=c6e82eb96aba6354a35143ccae6f0ae87b4c1204;p=libs%2Fcore.git

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 96dc760..a4595e6 100644
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,5 +1,5 @@
 /*
-This file is part of libmspframework     
+This file is part of libmspcore     
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #include <stdint.h>
 #include <time.h>
 #include <ostream>
+#include "types.h"
 
 namespace Msp {
 namespace Time {
@@ -29,13 +30,13 @@ public:
 	serialization together with the raw() function.  For creating TimeDeltas
 	with a specific length, see units.h.
 	*/
-	explicit TimeDelta(int64_t u): usec(u) { }
+	explicit TimeDelta(RawTime u): usec(u) { }
 
 	/**
 	Returns the raw number stored inside the TimeDelta.  This should only be used
 	for serialization and the result should not be interpreted in any way.
 	*/
-	int64_t raw() const { return usec; }
+	RawTime raw() const { return usec; }
 
 #ifndef WIN32
 	/**
@@ -51,16 +52,16 @@ public:
 	TimeDelta &operator-=(const TimeDelta &t)      { usec-=t.usec; return *this; }
 
 	template<typename T>
-	TimeDelta operator*(T a) const                 { return TimeDelta((int64_t)(usec*a)); }
+	TimeDelta operator*(T a) const                 { return TimeDelta(int64_t(usec*a)); }
 	template<typename T>
-	TimeDelta &operator*=(T a)                     { usec=(int64_t)(usec*a); return *this; }
+	TimeDelta &operator*=(T a)                     { usec=int64_t(usec*a); return *this; }
 
 	template<typename T>
-	TimeDelta operator/(T a) const                 { return TimeDelta((int64_t)(usec/a)); }
+	TimeDelta operator/(T a) const                 { return TimeDelta(int64_t(usec/a)); }
 	template<typename T>
-	TimeDelta &operator/=(T a)                     { usec=(int64_t)(usec/a); return *this; }
+	TimeDelta &operator/=(T a)                     { usec=int64_t(usec/a); return *this; }
 
-	double    operator/(const TimeDelta &t) const  { return (double)usec/t.usec; }
+	double    operator/(const TimeDelta &t) const  { return double(usec)/t.usec; }
 
 	bool      operator>(const TimeDelta &t) const  { return usec>t.usec; }
 	bool      operator>=(const TimeDelta &t) const { return usec>=t.usec; }
@@ -69,16 +70,16 @@ 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; }
-
-	friend std::ostream &operator<<(std::ostream &, const TimeDelta &);
+	operator const void *() const                  { return usec ? this : 0; }
 private:
-	int64_t usec;
+	RawTime usec;
 };
 
 template<typename T>
 inline TimeDelta operator*(T a, const TimeDelta &t)   { return t*a; }
 
+extern std::ostream &operator<<(std::ostream &, const TimeDelta &);
+
 } // namespace Time
 } // namespace Msp