Add LogicError exception class

[libs/core.git] / source / time / timedelta.h

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 6ebfcd86afc8b5c042f64b998623251d470aa628..26da8f405832808e8956b659182362c7c9758ec9 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,14 +1,16 @@
-/*
+/* $Id$
+
 This file is part of libmspcore     
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef MSP_TIME_TIMEDELTA_H_
 #define MSP_TIME_TIMEDELTA_H_
 
-#include <stdint.h>
 #include <time.h>
 #include <ostream>
+#include "types.h"
 
 namespace Msp {
 namespace Time {
@@ -18,6 +20,9 @@ Represents a quantity of time, such as five seconds.
 */
 class TimeDelta
 {
+private:
+       RawTime usec;
+
 public:
        /**
        Constructs a zero TimeDelta.
@@ -29,13 +34,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,14 +56,14 @@ 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(RawTime(usec*a)); }
        template<typename T>
-       TimeDelta &operator*=(T a)                     { usec=int64_t(usec*a); return *this; }
+       TimeDelta &operator*=(T a)                     { usec=RawTime(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(RawTime(usec/a)); }
        template<typename T>
-       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; }
 
@@ -69,9 +74,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; }
-private:
-       int64_t usec;
+       operator const void *() const                  { return usec ? this : 0; }
 };
 
 template<typename T>