59,60c59,61
< Event *limit_event;
< limit_event = schedExitSimLoop("simulate() limit reached", num_cycles);
---
> Event *limit_event =
> new SimLoopExitEvent("simulate() limit reached", 0);
> mainEventQueue.schedule(limit_event, num_cycles);
85,86c86,87
< limit_event->deschedule();
< delete limit_event;
---
> limit_event->squash();
> warn_once("be nice to actually delete the event here");