From 1df03b67e7989a19ba619dba3b626f0c011659a3 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 2 Aug 2013 09:36:04 -0700 Subject: [PATCH] Add RelativeTime::seconds() ctor --- .../beast_core/time/beast_RelativeTime.cpp | 31 ++++++++++--------- modules/beast_core/time/beast_RelativeTime.h | 17 +++++----- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/modules/beast_core/time/beast_RelativeTime.cpp b/modules/beast_core/time/beast_RelativeTime.cpp index 85db5c9b9e..2e1cc607af 100644 --- a/modules/beast_core/time/beast_RelativeTime.cpp +++ b/modules/beast_core/time/beast_RelativeTime.cpp @@ -21,32 +21,33 @@ */ //============================================================================== -RelativeTime::RelativeTime (const double secs) noexcept : seconds (secs) {} -RelativeTime::RelativeTime (const RelativeTime& other) noexcept : seconds (other.seconds) {} +RelativeTime::RelativeTime (const double secs) noexcept : numSeconds (secs) {} +RelativeTime::RelativeTime (const RelativeTime& other) noexcept : numSeconds (other.numSeconds) {} RelativeTime::~RelativeTime() noexcept {} //============================================================================== RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); } RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); } +RelativeTime RelativeTime::seconds (double s) noexcept { return RelativeTime (s); } RelativeTime RelativeTime::minutes (const double numberOfMinutes) noexcept { return RelativeTime (numberOfMinutes * 60.0); } RelativeTime RelativeTime::hours (const double numberOfHours) noexcept { return RelativeTime (numberOfHours * (60.0 * 60.0)); } RelativeTime RelativeTime::days (const double numberOfDays) noexcept { return RelativeTime (numberOfDays * (60.0 * 60.0 * 24.0)); } RelativeTime RelativeTime::weeks (const double numberOfWeeks) noexcept { return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0)); } //============================================================================== -int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (seconds * 1000.0); } -double RelativeTime::inMinutes() const noexcept { return seconds / 60.0; } -double RelativeTime::inHours() const noexcept { return seconds / (60.0 * 60.0); } -double RelativeTime::inDays() const noexcept { return seconds / (60.0 * 60.0 * 24.0); } -double RelativeTime::inWeeks() const noexcept { return seconds / (60.0 * 60.0 * 24.0 * 7.0); } +int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (numSeconds * 1000.0); } +double RelativeTime::inMinutes() const noexcept { return numSeconds / 60.0; } +double RelativeTime::inHours() const noexcept { return numSeconds / (60.0 * 60.0); } +double RelativeTime::inDays() const noexcept { return numSeconds / (60.0 * 60.0 * 24.0); } +double RelativeTime::inWeeks() const noexcept { return numSeconds / (60.0 * 60.0 * 24.0 * 7.0); } //============================================================================== -RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept { seconds = other.seconds; return *this; } +RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept { numSeconds = other.numSeconds; return *this; } -RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept { seconds += t.seconds; return *this; } -RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept { seconds -= t.seconds; return *this; } -RelativeTime RelativeTime::operator+= (const double secs) noexcept { seconds += secs; return *this; } -RelativeTime RelativeTime::operator-= (const double secs) noexcept { seconds -= secs; return *this; } +RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept { numSeconds += t.numSeconds; return *this; } +RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept { numSeconds -= t.numSeconds; return *this; } +RelativeTime RelativeTime::operator+= (const double secs) noexcept { numSeconds += secs; return *this; } +RelativeTime RelativeTime::operator-= (const double secs) noexcept { numSeconds -= secs; return *this; } RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept { return t1 += t2; } RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept { return t1 -= t2; } @@ -68,13 +69,13 @@ static void translateTimeField (String& result, int n, const char* singular, con String RelativeTime::getDescription (const String& returnValueForZeroTime) const { - if (seconds < 0.001 && seconds > -0.001) + if (numSeconds < 0.001 && numSeconds > -0.001) return returnValueForZeroTime; String result; result.preallocateBytes (32); - if (seconds < 0) + if (numSeconds < 0) result << '-'; int fieldsShown = 0; @@ -130,4 +131,4 @@ String RelativeTime::getDescription (const String& returnValueForZeroTime) const } return result.trimEnd(); -} +} \ No newline at end of file diff --git a/modules/beast_core/time/beast_RelativeTime.h b/modules/beast_core/time/beast_RelativeTime.h index 3a3d9e2eb7..f4bc9c4873 100644 --- a/modules/beast_core/time/beast_RelativeTime.h +++ b/modules/beast_core/time/beast_RelativeTime.h @@ -35,7 +35,7 @@ If you need an absolute time, (i.e. a date + time), see the Time class. */ -class BEAST_API RelativeTime +class BEAST_API RelativeTime { public: //============================================================================== @@ -57,15 +57,20 @@ public: //============================================================================== /** Creates a new RelativeTime object representing a number of milliseconds. - @see minutes, hours, days, weeks + @see seconds, minutes, hours, days, weeks */ static RelativeTime milliseconds (int milliseconds) noexcept; /** Creates a new RelativeTime object representing a number of milliseconds. - @see minutes, hours, days, weeks + @see seconds, minutes, hours, days, weeks */ static RelativeTime milliseconds (int64 milliseconds) noexcept; + /** Creates a new RelativeTime object representing a number of seconds. + @see milliseconds, minutes, hours, days, weeks + */ + static RelativeTime seconds (double seconds) noexcept; + /** Creates a new RelativeTime object representing a number of minutes. @see milliseconds, hours, days, weeks */ @@ -95,7 +100,7 @@ public: /** Returns the number of seconds this time represents. @see inMilliseconds, inMinutes, inHours, inDays, inWeeks */ - double inSeconds() const noexcept { return seconds; } + double inSeconds() const noexcept { return numSeconds; } /** Returns the number of minutes this time represents. @see inMilliseconds, inSeconds, inHours, inDays, inWeeks @@ -148,7 +153,7 @@ public: private: //============================================================================== - double seconds; + double numSeconds; }; //============================================================================== @@ -171,6 +176,4 @@ RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept; /** Subtracts two RelativeTimes. */ RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept; - - #endif // BEAST_RELATIVETIME_BEASTHEADER