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/users.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/users.cpp') diff --git a/src/users.cpp b/src/users.cpp index bd99c234d..3198ab0b0 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -348,7 +348,7 @@ void UserIOHandler::OnError(BufferedSocketError sockerr) ServerInstance->Users.QuitUser(user, GetError()); } -CullResult User::cull() +Cullable::Result User::Cull() { if (!quitting) ServerInstance->Users.QuitUser(this, "Culled without QuitUser"); @@ -359,21 +359,21 @@ CullResult User::cull() if (server->IsService()) stdalgo::erase(ServerInstance->Users.all_services, this); - return Extensible::cull(); + return Extensible::Cull(); } -CullResult LocalUser::cull() +Cullable::Result LocalUser::Cull() { - eh.cull(); - return User::cull(); + eh.Cull(); + return User::Cull(); } -CullResult FakeUser::cull() +Cullable::Result FakeUser::Cull() { // Fake users don't quit, they just get culled. quitting = true; // Fake users are not inserted into UserManager::clientlist or uuidlist, so we don't need to modify those here - return User::cull(); + return User::Cull(); } void User::Oper(std::shared_ptr info) -- cgit v1.3.1-10-gc9f91