X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.cpp;h=eda782e0d92c5bf82c00418584e12917d03fa673;hb=HEAD;hp=d35d12743ece9cb4ca89906f0fd97a3eff793a2c;hpb=122846f0881673770d88eff7d925ecf25c01b62e;p=libs%2Fcore.git

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index d35d127..eda782e 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -22,7 +22,7 @@ Timer::Slot &Timer::add(const TimeDelta &td)
 {
 	Slot *s = new Slot(td);
 	MutexLock l(mutex);
-	slots.push_back(s);
+	slots.push_back({ s });
 	push_heap(slots.begin(), slots.end());
 	if(blocking)
 		sem.signal();
@@ -33,7 +33,7 @@ Timer::Slot &Timer::add(const TimeStamp &ts)
 {
 	Slot *s = new Slot(ts);
 	MutexLock l(mutex);
-	slots.push_back(s);
+	slots.push_back({ s });
 	push_heap(slots.begin(), slots.end());
 	if(blocking)
 		sem.signal();
@@ -71,7 +71,7 @@ void Timer::do_tick(const TimeDelta &timeout)
 	if(timeout>=zero)
 		deadline = now()+timeout;
 
-	Slot *next = 0;
+	Slot *next = nullptr;
 	{
 		MutexLock l(mutex);
 		while(1)
@@ -113,7 +113,7 @@ void Timer::do_tick(const TimeDelta &timeout)
 		if(next->signal_timeout.emit() && next->increment())
 		{
 			MutexLock l(mutex);
-			slots.push_back(next);
+			slots.push_back({ next });
 			push_heap(slots.begin(), slots.end());
 		}
 		else
@@ -152,10 +152,6 @@ bool Timer::Slot::increment()
 }
 
 
-Timer::SlotProxy::SlotProxy(Slot *s):
-	slot(s)
-{ }
-
 bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
 {
 	return slot->get_timeout()>sp.slot->get_timeout();