Rename time/types.h to rawtime.h

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

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 26da8f405832808e8956b659182362c7c9758ec9..0a9ddd972a0646ea441ce96f2b6a84d18abc617f 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -9,8 +9,9 @@ Distributed under the LGPL
 #define MSP_TIME_TIMEDELTA_H_
 
 #include <time.h>
-#include <ostream>
-#include "types.h"
+#include <sys/time.h>
+#include <msp/strings/lexicalcast.h>
+#include "rawtime.h"
 
 namespace Msp {
 namespace Time {
@@ -47,7 +48,9 @@ public:
        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; }
+       void fill_timespec(timespec &ts) const { ts.tv_sec=usec/1000000; ts.tv_nsec = (usec%1000000)*1000; }
+
+       void fill_timeval(timeval &tv) const { tv.tv_sec=usec/1000000; tv.tv_usec = usec%1000000; }
 #endif
 
        TimeDelta operator+(const TimeDelta &t) const  { return TimeDelta(usec+t.usec); }
@@ -80,7 +83,7 @@ public:
 template<typename T>
 inline TimeDelta operator*(T a, const TimeDelta &t)   { return t*a; }
 
-extern std::ostream &operator<<(std::ostream &, const TimeDelta &);
+void operator<<(LexicalConverter &, const TimeDelta &);
 
 } // namespace Time
 } // namespace Msp