This works with multiple remote includes now except it hangs when an include is withi...

[user/henk/code/inspircd.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index c041075025321e04fc5aa8cd8b2e20fb64a11fc3..9bc37012d4dc6bd6705d32e0f90149c31a65a48e 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDtimer */
+
 #include "inspircd.h"
 #include "timer.h"
 
@@ -33,7 +35,7 @@ void TimerManager::TickTimers(time_t TIME)
                 */
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = *y;
+                       Timer* n = *y;
                        n->Tick(TIME);
                        if (n->GetRepeat())
                        {
@@ -41,18 +43,18 @@ void TimerManager::TickTimers(time_t TIME)
                        }
                        else
                        {
-                               DELETE(n);
+                               delete n;
                        }
                }
 
                Timers.erase(found);
-               DELETE(x);
+               delete x;
        }
 
        this->CantDeleteHere = false;
 }
 
-void TimerManager::DelTimer(InspTimer* T)
+void TimerManager::DelTimer(Timer* T)
 {
        if (this->CantDeleteHere)
        {
@@ -79,15 +81,15 @@ void TimerManager::DelTimer(InspTimer* T)
                timergroup* x = found->second;
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = *y;
+                       Timer* n = *y;
                        if (n == T)
                        {
-                               DELETE(n);
+                               delete n;
                                x->erase(y);
                                if (!x->size())
                                {
                                        Timers.erase(found);
-                                       DELETE(x);
+                                       delete x;
                                }
                                return;
                        }
@@ -108,7 +110,7 @@ void TimerManager::TickMissedTimers(time_t TIME)
                this->TickTimers(TIME);
 }
 
-void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
+void TimerManager::AddTimer(Timer* T, long secs_from_now)
 {
        timergroup* x = NULL;