diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-12-12 05:21:06 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-12-12 05:21:06 +0000 |
| commit | 6c1f3655156e8a357ee30891301daa6a0ab1b980 (patch) | |
| tree | 8400070ce37d4862bd59e6230254d4a07ef42397 | |
| parent | 2c017baa4ad270f7a951161c6fc6f3ba7f7d2429 (diff) | |
* reenabled assertions after irc-ing with drobilla
git-svn-id: svn://localhost/ardour2/branches/3.0@4311 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 4 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index dfc4ae3867..e1cea8e191 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -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; diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 3de24106d4..d746f470b6 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -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; |