Fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3300 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/timer.h b/include/timer.h
index b6fd62281b8a1a6b90441873ac7f89bb6926a185..894a0d0e1251ba4cc69804ab866f9c50d0a5d25a 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -3,7 +3,7 @@ class InspTimer
  private:
        time_t trigger;
  public:
-       virtual InspTimer(long secs_from_now) : trigger(time(NULL) + secs_from_now) { }
+       InspTimer(long secs_from_now) : trigger(time(NULL) + secs_from_now) { }
        virtual ~InspTimer() { }
        virtual time_t GetTimer()
        {

diff --git a/src/timer.cpp b/src/timer.cpp
index e6545bf4097db3af5911bbc6b5c29fc46119763f..31c2c6a1397b1270c4f46dc08e94df15648eb1de 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -50,21 +50,21 @@ void TickTimers(time_t TIME)
 
        if (found != Timers.end())
        {
-               log("timer.cpp: There are timers to trigger");
-               timerlist* x = found->second;
+               log(DEBUG,"timer.cpp: There are timers to trigger");
+               timergroup* x = found->second;
                /*
                 * There are pending timers to trigger
                 */
-               for (timerlist::iterator y = x.begin(); y != x.end(); y++)
+               for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       log("timer.cpp: Triggering a timer");
+                       log(DEBUG,"timer.cpp: Triggering a timer");
                        InspTimer* n = (InspTimer*)*y;
                        n->Tick(TIME);
-                       log("timer.cpp: TICK!");
+                       log(DEBUG,"timer.cpp: TICK!");
                        delete n;
                }
 
-               log("timer.cpp: Done triggering timers, tidying up");
+               log(DEBUG,"timer.cpp: Done triggering timers, tidying up");
                Timers.erase(found);
                delete x;
        }
@@ -72,7 +72,7 @@ void TickTimers(time_t TIME)
 
 void AddTimer(InspTimer* T)
 {
-       log("timer.cpp: Adding timer");
+       log(DEBUG,"timer.cpp: Adding timer");
        
        timergroup* x = NULL;
 
@@ -80,12 +80,12 @@ void AddTimer(InspTimer* T)
        
        if (found != Timers.end())
        {
-               log("timer.cpp: Add timer to existing group");
+               log(DEBUG,"timer.cpp: Add timer to existing group");
                x = found->second;
        }
        else
        {
-               log("timer.cpp: Add timer to new group");
+               log(DEBUG,"timer.cpp: Add timer to new group");
                x = new timergroup;
                Timers[T->GetTimer()] = x;
        }