Make classbase and refcountbase uncopyable; expand comments on their indended uses

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 657225069823aadb95832ff26b1fd4c857722dd6..542a6e565c57751c0c315a91e2ac1df340f4a8eb 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -583,14 +583,14 @@ void User::OnError(BufferedSocketError)
        ServerInstance->Users->QuitUser(this, getError());
 }
 
-bool User::cull()
+CullResult User::cull()
 {
        if (!quitting)
                ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
        if (uuid.empty())
        {
                ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty");
-               return true;
+               return Extensible::cull();
        }
        PurgeEmptyChannels();
        if (IS_LOCAL(this))
@@ -625,7 +625,7 @@ bool User::cull()
 
        ServerInstance->Users->uuidlist->erase(uuid);
        uuid.clear();
-       return true;
+       return Extensible::cull();
 }
 
 void User::Oper(const std::string &opertype, const std::string &opername)