46c46
< _sc_event(_sc_event), _basename(_basename), delayedNotify(this)
---
> _sc_event(_sc_event), _basename(_basename), delayedNotifyEvent(this)
123a124,130
> Event::delayedNotify()
> {
> scheduler.eventHappened();
> notify();
> }
>
> void
127,130c134,136
< Tick new_tick = t.value() * SimClock::Int::ps +
< scheduler.eventQueue().getCurTick();
< if (delayedNotify.scheduled()) {
< Tick old_tick = delayedNotify.when();
---
> Tick new_tick = t.value() * SimClock::Int::ps + scheduler.getCurTick();
> if (delayedNotifyEvent.scheduled()) {
> Tick old_tick = delayedNotifyEvent.when();
135c141
< scheduler.eventQueue().deschedule(&delayedNotify);
---
> scheduler.deschedule(&delayedNotifyEvent);
138c144
< scheduler.eventQueue().schedule(&delayedNotify, new_tick);
---
> scheduler.schedule(&delayedNotifyEvent, new_tick);
144,145c150,151
< if (delayedNotify.scheduled())
< scheduler.eventQueue().deschedule(&delayedNotify);
---
> if (delayedNotifyEvent.scheduled())
> scheduler.deschedule(&delayedNotifyEvent);