Fix test client error cheecking on result types

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

diff --git a/src/timer.cpp b/src/timer.cpp
index 14e61216885f42f92b62d2794a32a092d53e7aa2..f35a9c67be4acc39b5d8a992bc131eaba667495c 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,33 +14,17 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <vector>
+#include <map>
 #include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
+#include "typedefs.h"
 #include "helperfuncs.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
+#include "timer.h"
 
 typedef std::vector<InspTimer*> timergroup;
 typedef std::map<time_t, timergroup*> timerlist;
+
 timerlist Timers;
 
 void TickTimers(time_t TIME)
@@ -55,13 +39,13 @@ void TickTimers(time_t TIME)
                 */
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = (InspTimer*)*y;
+                       InspTimer* n = *y;
                        n->Tick(TIME);
-                       delete n;
+                       DELETE(n);
                }
 
                Timers.erase(found);
-               delete x;
+               DELETE(x);
        }
 }
 
@@ -83,13 +67,13 @@ void TickMissedTimers(time_t TIME)
                        timergroup* x = found->second;
                        for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                        {
-                               InspTimer* z = (InspTimer*)*y;
+                               InspTimer* z = *y;
                                z->Tick(TIME);
-                               delete z;
+                               DELETE(z);
                        }
 
                        Timers.erase(found);
-                       delete x;
+                       DELETE(x);
                }
        }
 }