From 4e488cb54d72fb4a1caa580f6756a6f4687beaf6 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 2 Mar 2021 05:39:12 +0000 Subject: Refactor classbase/CullResult into Cullable/Cullable::Result. --- src/modules/m_spanningtree/treeserver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 ca9773fde..1d64826e6 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -197,7 +197,7 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason, bool if (server->IsLocal()) server->GetSocket()->Close(); - // Add the server to the cull list, the servers behind it are handled by cull() and the destructor + // Add the server to the cull list, the servers behind it are handled by Cull() and the destructor ServerInstance->GlobalCulls.AddItem(server); } @@ -270,18 +270,18 @@ void TreeServer::AddHashEntry() Utils->sidlist[GetId()] = this; } -CullResult TreeServer::cull() +Cullable::Result TreeServer::Cull() { // Recursively cull all servers that are under us in the tree for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) { TreeServer* server = *i; - server->cull(); + server->Cull(); } if (!IsRoot()) - ServerUser->cull(); - return classbase::cull(); + ServerUser->Cull(); + return Cullable::Cull(); } TreeServer::~TreeServer() -- cgit v1.3.1-10-gc9f91