Merge pull request #495 from SaberUK/master+fix-libcpp

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treeserver.cpp

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 65e1191495fe5d4b59157a4e310c1f06f4474c20..4ce7c49d5d2cc803036671e7caf5dfdfb8e87554 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -21,10 +21,9 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
 #include "xline.h"
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 
 #include "utils.h"
 #include "treeserver.h"
@@ -42,7 +41,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::strin
        bursting = false;
        Parent = NULL;
        VersionString.clear();
-       ServerUserCount = ServerOperCount = 0;
+       UserCount = OperCount = 0;
        VersionString = ServerInstance->GetVersionString();
        Route = NULL;
        Socket = NULL; /* Fix by brain */
@@ -62,7 +61,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::strin
        age = ServerInstance->Time();
        bursting = true;
        VersionString.clear();
-       ServerUserCount = ServerOperCount = 0;
+       UserCount = OperCount = 0;
        SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
        SetPingFlag();
        Warned = false;
@@ -70,7 +69,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::strin
 
        long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
        this->StartBurst = ts;
-       ServerInstance->Logs->Log("m_spanningtree",DEBUG, "Started bursting at time %lu", ts);
+       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG, "Started bursting at time %lu", ts);
 
        /* find the 'route' for this server (e.g. the one directly connected
         * to the local server, which we can use to reach it)
@@ -158,7 +157,7 @@ void TreeServer::FinishBurst()
 
 void TreeServer::SetID(const std::string &id)
 {
-       ServerInstance->Logs->Log("m_spanningtree",DEBUG, "Setting SID to " + id);
+       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG, "Setting SID to " + id);
        sid = id;
        Utils->sidlist[sid] = this;
 }
@@ -257,26 +256,6 @@ void TreeServer::SetPingFlag()
        LastPingWasGood = true;
 }
 
-unsigned int TreeServer::GetUserCount()
-{
-       return ServerUserCount;
-}
-
-void TreeServer::SetUserCount(int diff)
-{
-       ServerUserCount += diff;
-}
-
-void TreeServer::SetOperCount(int diff)
-{
-       ServerOperCount += diff;
-}
-
-unsigned int TreeServer::GetOperCount()
-{
-       return ServerOperCount;
-}
-
 TreeSocket* TreeServer::GetSocket()
 {
        return Socket;
@@ -321,13 +300,11 @@ void TreeServer::AddChild(TreeServer* Child)
 
 bool TreeServer::DelChild(TreeServer* Child)
 {
-       for (std::vector<TreeServer*>::iterator a = Children.begin(); a != Children.end(); a++)
+       std::vector<TreeServer*>::iterator it = std::find(Children.begin(), Children.end(), Child);
+       if (it != Children.end())
        {
-               if (*a == Child)
-               {
-                       Children.erase(a);
-                       return true;
-               }
+               Children.erase(it);
+               return true;
        }
        return false;
 }