Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 0256756425f4b815152d34d4ff53bd6c272c90af..900aceb9dfde62ee11a97c014082487eae0539a9 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -72,7 +72,7 @@ bool TreeSocket::RemoteServer(const std::string &prefix, parameterlist &params)
 
        Link* lnk = Utils->FindLink(servername);
 
-       TreeServer *Node = new TreeServer(this->Utils, ServerInstance, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
+       TreeServer *Node = new TreeServer(Utils, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
 
        ParentOfThis->AddChild(Node);
        params[4] = ":" + params[4];
@@ -120,8 +120,9 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                return false;
        }
 
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
+               Link* x = *i;
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
@@ -158,7 +159,7 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 
                Utils->timeoutlist.erase(this);
 
-               TreeServer *Node = new TreeServer(this->Utils, ServerInstance, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
+               TreeServer *Node = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
 
                Utils->TreeRoot->AddChild(Node);
                params[4] = ":" + params[4];
@@ -215,8 +216,9 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
                return false;
        }
 
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
+               Link* x = *i;
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;