* reenabled assertions after irc-ing with drobilla

git-svn-id: svn://localhost/ardour2/branches/3.0@4311 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2008-12-12 05:21:06 +00:00
parent 2c017baa4a
commit 6c1f365515
2 changed files with 2 additions and 6 deletions

View File

@ -1080,9 +1080,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
* (Optimize for immediate call this cycle within range) */
_search_cache.left = x;
//++_search_cache.range.first;
if (! (inclusive ? x >= start : x > start)) {
cerr << "Warning: failed assertion: inclusive ? x >= start : x > start in ControlList.cpp" << endl;
}
assert(inclusive ? x >= start : x > start);
return true;
} else {
return false;

View File

@ -193,9 +193,7 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
const bool ret = _control_iter->list->rt_safe_earliest_event_unlocked(
_control_iter->x, DBL_MAX, x, y, false);
if ( !(!ret || x > _control_iter->x) ) {
cerr << "Warning: Assertion failed: !ret || x > _control_iter->x in Sequence.cpp" << endl;
}
assert(!ret || x > _control_iter->x);
if (ret) {
_control_iter->x = x;