diff options
Diffstat (limited to 'src/systemc/core/scheduler.hh')
| -rw-r--r-- | src/systemc/core/scheduler.hh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh index 697aa11ad..3068a0aaa 100644 --- a/src/systemc/core/scheduler.hh +++ b/src/systemc/core/scheduler.hh @@ -238,10 +238,11 @@ class Scheduler deschedule(ScEvent *event) { if (event->when() == getCurTick()) { - // Remove from delta notifications. - deltas.erase(event); - event->deschedule(); - return; + // Attempt to remove from delta notifications. + if (deltas.erase(event) == 1) { + event->deschedule(); + return; + } } // Timed notification/timeout. @@ -250,7 +251,7 @@ class Scheduler "Descheduling event at time with no events."); TimeSlot *ts = tsit->second; ScEvents &events = ts->events; - events.erase(event); + assert(events.erase(event)); event->deschedule(); // If no more events are happening at this time slot, get rid of it. |