Mark boolean conversion operators as explicit

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

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 972ee26387406d224b11bf3f77f76b4c88fdd296..1a4274ba3a35c05822ad6f18c43775cf02e592e4 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -1,6 +1,7 @@
 #ifndef MSP_TIME_TIMEDELTA_H_
 #define MSP_TIME_TIMEDELTA_H_
 
+#include <cstdlib>
 #include <ctime>
 #include <msp/strings/lexicalcast.h>
 #include "rawtime.h"
@@ -14,15 +15,14 @@ Represents a quantity of time, such as five seconds.
 class TimeDelta
 {
 private:
-       RawTime usec;
+       RawTime usec = 0;
 
 public:
        /** Constructs a zero TimeDelta. */
-       TimeDelta(): usec(0) { }
+       TimeDelta() = default;
 
        /** Constructs a TimeDelta from a plain number.  The purpose of this is to
-       allow serialization together with the raw() function.  For creating
-       TimeDeltas with a specific length, see units.h. */
+       allow serialization together with the raw() function. */
        explicit TimeDelta(RawTime u): usec(u) { }
 
        /** Returns the raw number stored inside the TimeDelta.  This should only be used
@@ -33,6 +33,7 @@ public:
        TimeDelta &operator+=(const TimeDelta &t) { usec += t.usec; return *this; }
        TimeDelta operator-(const TimeDelta &t) const { return TimeDelta(usec-t.usec); }
        TimeDelta &operator-=(const TimeDelta &t) { usec -= t.usec; return *this; }
+       TimeDelta operator-() const { return TimeDelta(-usec); }
 
        template<typename T>
        TimeDelta operator*(T a) const { return TimeDelta(RawTime(usec*a)); }
@@ -53,12 +54,7 @@ public:
        bool operator==(const TimeDelta &t) const { return usec==t.usec; }
        bool operator!=(const TimeDelta &t) const { return usec!=t.usec; }
 
-#ifndef WIN32
-       operator timeval() const { return rawtime_to_timeval(usec); }
-       operator timespec() const { return rawtime_to_timespec(usec); }
-#endif
-
-       operator const void *() const { return usec ? this : 0; }
+       explicit operator bool() const { return usec; }
 };
 
 template<typename T>
@@ -66,6 +62,20 @@ inline TimeDelta operator*(T a, const TimeDelta &t) { return t*a; }
 
 void operator<<(LexicalConverter &, const TimeDelta &);
 
+
+// Constants to be used in creation of TimeDeltas
+extern const TimeDelta zero;
+extern const TimeDelta usec;
+extern const TimeDelta msec;
+extern const TimeDelta sec;
+extern const TimeDelta min;
+extern const TimeDelta hour;
+extern const TimeDelta day;
+extern const TimeDelta week;
+
+inline TimeDelta abs(const TimeDelta &t) { return t>=zero ? t : -t; }
+using std::abs;
+
 } // namespace Time
 } // namespace Msp