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 a79105f5292d23e5ce6599619c703897f1990461..9bc37012d4dc6bd6705d32e0f90149c31a65a48e 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDtimer */
+
 #include "inspircd.h"
 #include "timer.h"
 
@@ -41,12 +43,12 @@ void TimerManager::TickTimers(time_t TIME)
                        }
                        else
                        {
-                               DELETE(n);
+                               delete n;
                        }
                }
 
                Timers.erase(found);
-               DELETE(x);
+               delete x;
        }
 
        this->CantDeleteHere = false;
@@ -82,12 +84,12 @@ void TimerManager::DelTimer(Timer* T)
                        Timer* n = *y;
                        if (n == T)
                        {
-                               DELETE(n);
+                               delete n;
                                x->erase(y);
                                if (!x->size())
                                {
                                        Timers.erase(found);
-                                       DELETE(x);
+                                       delete x;
                                }
                                return;
                        }