From d601a77c42d8a594234c6bc48a812174b79ac5e8 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 29 Apr 2016 18:22:36 -0400 Subject: [PATCH] Datafile: Added assert to ::deleteInterval to confirm redundancy --- src/Datafile.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Datafile.cpp b/src/Datafile.cpp index e8083fb2..210b1fe6 100644 --- a/src/Datafile.cpp +++ b/src/Datafile.cpp @@ -105,20 +105,18 @@ void Datafile::addInterval (const Interval& interval) //////////////////////////////////////////////////////////////////////////////// void Datafile::deleteInterval (const Interval& interval) { - // Return false if the interval does not belong in this file. // Note: end date might be zero. - if (_range.overlap (interval.range)) - { - if (! _lines_loaded) - load_lines (); + assert (_range.overlap (interval.range)); - auto serialized = interval.serialize (); - auto i = std::find (_lines.begin (), _lines.end (), serialized); - if (i != _lines.end ()) - { - _lines.erase (i); - _dirty = true; - } + if (! _lines_loaded) + load_lines (); + + auto serialized = interval.serialize (); + auto i = std::find (_lines.begin (), _lines.end (), serialized); + if (i != _lines.end ()) + { + _lines.erase (i); + _dirty = true; } }