X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=42cd37fb9ec8ef0b6171f38fbef59767523088f5;hb=da28fe0b8c0bec9ab111044b1004f24cbf2d742e;hp=65e1191495fe5d4b59157a4e310c1f06f4474c20;hpb=97e8518c1961c3d1ff7b3a0ad4e04ee2880c1fc4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 65e119149..42cd37fb9 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -24,7 +24,7 @@
 #include "socket.h"
 #include "xline.h"
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 
 #include "utils.h"
 #include "treeserver.h"
@@ -70,7 +70,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 +158,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;
 }
@@ -321,13 +321,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;
 }