Assimilate exceptions and RefPtr from mspmisc

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

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 694136ec8e78477a0acbcb82227c607824491b67..6ebfcd86afc8b5c042f64b998623251d470aa628 100644 (file)
--- 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
 */
@@ -37,11 +37,13 @@ public:
        */
        int64_t raw() const { return usec; }
 
+#ifndef WIN32
        /**
        Fills in a timespec struct.  To get a meaningful scalar value from the
        TimeDelta, divide with one of the values in units.h.
        */
        void fill_timespec(timespec &ts) const { ts.tv_sec=usec/1000000; ts.tv_nsec=(usec%1000000)*1000; }
+#endif
 
        TimeDelta operator+(const TimeDelta &t) const  { return TimeDelta(usec+t.usec); }
        TimeDelta &operator+=(const TimeDelta &t)      { usec+=t.usec; return *this; }
@@ -49,16 +51,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; }
@@ -68,8 +70,6 @@ public:
        bool      operator!=(const TimeDelta &t) const { return usec!=t.usec; }
 
        operator bool() const                          { return usec; }
-
-       friend std::ostream &operator<<(std::ostream &, const TimeDelta &);
 private:
        int64_t usec;
 };
@@ -77,6 +77,8 @@ private:
 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