port to NetBSD

[chaz/yoink] / src / Moof / Timer.cc

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index a4dcf4047dfcc591f327accff93fa46039f7febc..7f51510ce60189320383f25272e87da9914dc353 100644 (file)
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -44,7 +44,7 @@ namespace Mf {
 
 
 Scalar Timer::gNextFire = std::numeric_limits<Scalar>::max();
-std::map<unsigned,Timer&> Timer::gTimers;
+std::map<unsigned,Timer*> 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<unsigned,Timer&>(mId, *this));
+               gTimers.insert(std::pair<unsigned,Timer*>(mId, this));
 
                if (mAbsolute < gNextFire) gNextFire = mAbsolute;
        }
@@ -123,12 +123,12 @@ void Timer::fire()
 
 Scalar Timer::findNextFire()
 {
-       std::map<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::iterator it;
        Scalar nextFire = std::numeric_limits<Scalar>::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<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::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();
        }
 }