X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=26ebf64a36d1725133934ef8fd9f282eca4da24d;hb=f5951e7166dfd7028b95d7c780406f65afc5cdfc;hp=8b4e5957ebd17257e55bf8a5e2979dc99f75868f;hpb=bb49a2de46849a9ffa509148661d4c574c43fe24;p=libs%2Fcore.git diff --git a/source/time/timer.h b/source/time/timer.h index 8b4e595..26ebf64 100644 --- a/source/time/timer.h +++ b/source/time/timer.h @@ -1,13 +1,14 @@ -/* +/* $Id$ + This file is part of libmspcore -Copyright © 2006 Mikko Rasa, Mikkosoft Productions +Copyright © 2006, 2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ #ifndef MSP_TIME_TIMER_H_ #define MSP_TIME_TIMER_H_ -#include +#include #include #include "../core/mutex.h" #include "../core/semaphore.h" @@ -52,7 +53,7 @@ private: bool operator<(const SlotProxy &) const; }; - std::set slots; + std::vector slots; Semaphore sem; Mutex mutex; @@ -83,7 +84,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; };