X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.cc;h=7f51510ce60189320383f25272e87da9914dc353;hp=a4dcf4047dfcc591f327accff93fa46039f7febc;hb=c9e20ac06383b20ceb5404c9237e319c2e90d157;hpb=cfe38a72ab859538db6269bc9b97f55e8f1f8709;ds=sidebyside diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc index a4dcf40..7f51510 100644 --- a/src/Moof/Timer.cc +++ b/src/Moof/Timer.cc @@ -44,7 +44,7 @@ namespace Mf { Scalar Timer::gNextFire = std::numeric_limits::max(); -std::map Timer::gTimers; +std::map Timer::gTimers; unsigned Timer::getNewID() @@ -75,7 +75,7 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode) } mId = getNewID(); - gTimers.insert(std::pair(mId, *this)); + gTimers.insert(std::pair(mId, this)); if (mAbsolute < gNextFire) gNextFire = mAbsolute; } @@ -123,12 +123,12 @@ void Timer::fire() Scalar Timer::findNextFire() { - std::map::iterator it; + std::map::iterator it; Scalar nextFire = std::numeric_limits::max(); for (it = gTimers.begin(); it != gTimers.end(); ++it) { - Scalar absolute = (*it).second.mAbsolute; + Scalar absolute = (*it).second->mAbsolute; if (absolute < nextFire) nextFire = absolute; } @@ -154,14 +154,14 @@ bool Timer::isRepeating() const void Timer::fireIfExpired(Scalar t) { - std::map::iterator it; + std::map::iterator it; if (gNextFire > t) return; for (it = gTimers.begin(); it != gTimers.end(); ++it) { - Timer& timer = (*it).second; - if (timer.isExpired()) timer.fire(); + Timer* timer = (*it).second; + if (timer->isExpired()) timer->fire(); } }