X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=b080f82f8f3d3713e50dca5b995739f30143e81d;hb=fc1475d88018934a61df890c192a404a105308fd;hp=8b4e5957ebd17257e55bf8a5e2979dc99f75868f;hpb=bb49a2de46849a9ffa509148661d4c574c43fe24;p=libs%2Fcore.git

diff --git a/source/time/timer.h b/source/time/timer.h
index 8b4e595..b080f82 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -1,16 +1,10 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMER_H_
 #define MSP_TIME_TIMER_H_
 
-#include <set>
+#include <vector>
 #include <sigc++/sigc++.h>
-#include "../core/mutex.h"
-#include "../core/semaphore.h"
+#include <msp/core/mutex.h>
+#include <msp/core/semaphore.h>
 #include "timedelta.h"
 #include "timestamp.h"
 
@@ -52,7 +46,7 @@ private:
 		bool operator<(const SlotProxy &) const;
 	};
 
-	std::set<SlotProxy> slots;
+	std::vector<SlotProxy> slots;
 	Semaphore sem;
 	Mutex mutex;
 
@@ -83,7 +77,7 @@ public:
 	Note: If there are no active timers when a blocking tick is executed, it
 	won't return until a timer is added from another thread.
 	*/
-	void tick(bool block=true);
+	void tick(bool block = true);
 
 	TimeStamp get_next_timeout() const;
 };