Merge pull request #1254 from genius3000/insp20+fixPIstatusmsgs

[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 37d81663bc21ef7358d5808618b4702e48f4cad6..493b05ebf78f6dda096e3c8b3ab04f86200dc16e 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -128,7 +128,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::strin
        SetID(id);
 }
 
-std::string& TreeServer::GetID()
+const std::string& TreeServer::GetID()
 {
        return sid;
 }
@@ -226,12 +226,12 @@ std::string TreeServer::GetName()
        return ServerName.c_str();
 }
 
-std::string TreeServer::GetDesc()
+const std::string& TreeServer::GetDesc()
 {
        return ServerDesc;
 }
 
-std::string TreeServer::GetVersion()
+const std::string& TreeServer::GetVersion()
 {
        return VersionString;
 }
@@ -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;
 }