From f7ed9642d4dd2b9bdab5b138fa9ab47d1258935c Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 14 May 2016 10:25:04 -0400 Subject: [PATCH] Range: Changed calls to more readable ones --- src/Range.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Range.cpp b/src/Range.cpp index 68d10f38..6d23f90d 100644 --- a/src/Range.cpp +++ b/src/Range.cpp @@ -286,12 +286,12 @@ std::vector Range::subtract (const Range& other) const // If the range is open, use 'now' as the end. time_t Range::total () const { - assert (! is_ended () || end >= start); + assert (is_open () || end >= start); - if (is_ended ()) - return Datetime (end) - Datetime (start); + if (is_open ()) + return Datetime () - Datetime (start); - return Datetime () - Datetime (start); + return Datetime (end) - Datetime (start); } ////////////////////////////////////////////////////////////////////////////////