kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/timer.cpp b/src/timer.cpp
index 0c2cabbbe0cb004f3b491264f254d65247159576..f35a9c67be4acc39b5d8a992bc131eaba667495c 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -22,10 +22,9 @@
 #include "helperfuncs.h"
 #include "timer.h"
 
-extern time_t TIME;
-
 typedef std::vector<InspTimer*> timergroup;
 typedef std::map<time_t, timergroup*> timerlist;
+
 timerlist Timers;
 
 void TickTimers(time_t TIME)
@@ -42,11 +41,11 @@ void TickTimers(time_t TIME)
                {
                        InspTimer* n = *y;
                        n->Tick(TIME);
-                       delete n;
+                       DELETE(n);
                }
 
                Timers.erase(found);
-               delete x;
+               DELETE(x);
        }
 }
 
@@ -70,11 +69,11 @@ void TickMissedTimers(time_t TIME)
                        {
                                InspTimer* z = *y;
                                z->Tick(TIME);
-                               delete z;
+                               DELETE(z);
                        }
 
                        Timers.erase(found);
-                       delete x;
+                       DELETE(x);
                }
        }
 }