delete obsolete methods from Duration (924d5377) · Commits · github_fork / Clip

src/signaltk/util/duration.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		#include <inttypes.h>
		#include <limits>
		#include <string>
		#include <sys/time.h> // struct timeval; struct timespec;
		#include "time_constants.h"

		class Duration {
		@@ -52,20 +51,6 @@ public:
		*/
		constexpr Duration(uint64_t microseconds);

		/**
		* Creates a new Duration out of a @c timeval struct.
		*
		* @param value duration as @c timeval.
		*/
		Duration(const struct ::timeval& value);

		/**
		* Creates a new Duration out of a @c timespec struct.
		*
		* @param value duration as @c timespec.
		*/
		Duration(const struct ::timespec& value);

		constexpr bool operator==(const Duration& other) const;
		constexpr bool operator!=(const Duration& other) const;
		constexpr bool operator<(const Duration& other) const;
		@@ -76,9 +61,6 @@ public:

		constexpr Duration operator+(const Duration& other) const;

		constexpr operator struct timeval() const;
		constexpr operator struct timespec() const;

		/**
		* Return the represented duration in microseconds
		*/

+0 −28

Original line number	Diff line number	Diff line
		@@ -28,12 +28,6 @@ inline constexpr Duration::Duration(ZeroType)
		inline constexpr Duration::Duration(uint64_t microseconds)
		: micros_(microseconds) {}

		inline Duration::Duration(const struct ::timeval& value)
		: micros_(value.tv_sec + value.tv_usec * kMicrosPerSecond) {}

		inline Duration::Duration(const struct ::timespec& value)
		: micros_(value.tv_sec + value.tv_nsec * kMicrosPerSecond / 1000) {}

		constexpr bool Duration::operator==(const Duration& other) const {
		return micros_ == other.micros_;
		}
		@@ -62,28 +56,6 @@ constexpr bool Duration::operator!() const {
		return micros_ == 0;
		}

		inline constexpr Duration::operator struct timeval() const {
		#if defined(STX_OS_DARWIN)
		// OS/X plays in it's own universe. ;(
		return { static_cast<time_t>(micros_ / kMicrosPerSecond),
		static_cast<__darwin_suseconds_t>(micros_ % kMicrosPerSecond) };
		#else
		return { static_cast<time_t>(micros_ / kMicrosPerSecond),
		static_cast<long>(micros_ % kMicrosPerSecond) };
		#endif
		}

		inline constexpr Duration::operator struct timespec() const {
		#if defined(STX_OS_DARWIN)
		// OS/X plays in it's own universe. ;(
		return { static_cast<time_t>(micros_ / kMicrosPerSecond),
		(static_cast<__darwin_suseconds_t>(micros_ % kMicrosPerSecond) * 1000) };
		#else
		return { static_cast<time_t>(micros_ / kMicrosPerSecond),
		(static_cast<long>(micros_ % kMicrosPerSecond) * 1000) };
		#endif
		}

		inline constexpr uint64_t Duration::microseconds() const noexcept {
		return micros_;
		}