96c96
< Tick resume = curTick + Clock::Int::ns * ns;
---
> Tick resume = curTick + SimClock::Int::ns * ns;
131c131,132
< return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns;
---
> return (tc->readLastActivate() - tc->readLastSuspend()) /
> SimClock::Int::ns;
139c140
< return curTick / Clock::Int::ns;
---
> return curTick / SimClock::Int::ns;
154c155
< Tick when = curTick + delay * Clock::Int::ns;
---
> Tick when = curTick + delay * SimClock::Int::ns;
232,233c233,234
< Tick when = curTick + delay * Clock::Int::ns;
< Tick repeat = period * Clock::Int::ns;
---
> Tick when = curTick + delay * SimClock::Int::ns;
> Tick repeat = period * SimClock::Int::ns;
245,246c246,247
< Tick when = curTick + delay * Clock::Int::ns;
< Tick repeat = period * Clock::Int::ns;
---
> Tick when = curTick + delay * SimClock::Int::ns;
> Tick repeat = period * SimClock::Int::ns;
258,259c259,260
< Tick when = curTick + delay * Clock::Int::ns;
< Tick repeat = period * Clock::Int::ns;
---
> Tick when = curTick + delay * SimClock::Int::ns;
> Tick repeat = period * SimClock::Int::ns;
270,271c271,272
< Tick when = curTick + delay * Clock::Int::ns;
< Tick repeat = period * Clock::Int::ns;
---
> Tick when = curTick + delay * SimClock::Int::ns;
> Tick repeat = period * SimClock::Int::ns;