X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=403e484cba7376412ca0a068c58f908e258d1ff1;hp=935df0323debc6c25dbb6e1bb8f62c54f12d67db;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=cfc8e0b7b15ea505bd6a6a9599cbc5ce1e316963 diff --git a/source/time/timer.h b/source/time/timer.h index 935df03..403e484 100644 --- a/source/time/timer.h +++ b/source/time/timer.h @@ -1,14 +1,7 @@ -/* $Id$ - -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 +#include #include #include "../core/mutex.h" #include "../core/semaphore.h" @@ -53,7 +46,7 @@ private: bool operator<(const SlotProxy &) const; }; - std::set slots; + std::vector slots; Semaphore sem; Mutex mutex; @@ -84,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; };