From 6b929c6dbb3d36c3873ab9911ad4d8a46ddbdc99 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Wed, 4 Jul 2012 20:26:24 +0200
Subject: m_spanningtree Use iterators in CAPAB handler and when generating
 reply to spanningtree related /stats, use std::find() in
 TreeServer::DelChild()

---
 src/modules/m_spanningtree/treeserver.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/modules/m_spanningtree/treeserver.cpp')

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 65e119149..493b05ebf 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -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;
 }
-- 
cgit v1.3.1-10-gc9f91