From 219993bc9018d9f0d9568330d7a972b68b785d27 Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 2 Sep 2009 00:43:25 +0000 Subject: Replace std::deque with std::vector in spanningtree and related modules git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11593 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket2.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/modules/m_spanningtree/treesocket2.cpp') diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index b117ebe82..bc9388c94 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -38,7 +38,7 @@ void TreeSocket::WriteLine(std::string line) /* Handle ERROR command */ -bool TreeSocket::Error(std::deque ¶ms) +bool TreeSocket::Error(parameterlist ¶ms) { if (params.size() < 1) return false; @@ -47,7 +47,7 @@ bool TreeSocket::Error(std::deque ¶ms) return false; } -void TreeSocket::Split(const std::string &line, std::deque &n) +void TreeSocket::Split(const std::string &line, parameterlist &n) { n.clear(); irc::tokenstream tokens(line); @@ -61,7 +61,7 @@ void TreeSocket::Split(const std::string &line, std::deque &n) bool TreeSocket::ProcessLine(std::string &line) { - std::deque params; + parameterlist params; irc::string command; std::string prefix; @@ -80,17 +80,20 @@ bool TreeSocket::ProcessLine(std::string &line) if ((params[0][0] == ':') && (params.size() > 1)) { prefix = params[0].substr(1); - params.pop_front(); if (prefix.empty()) { this->SendError("BUG (?) Empty prefix recieved: " + line); return false; } + command = params[1].c_str(); + params.erase(params.begin(), params.begin() + 2); + } + else + { + command = params[0].c_str(); + params.erase(params.begin()); } - - command = params[0].c_str(); - params.pop_front(); switch (this->LinkState) { -- cgit v1.3.1-10-gc9f91