Change allocation of UserManager::uuidlist to be physically part of the object contai...

[user/henk/code/inspircd.git] / include / usermanager.h

diff --git a/include/usermanager.h b/include/usermanager.h
index a807cd447b57de70db5f0d5118042f526eb064bc..b1c3520e9551db9cfcb7f6b9c9d58206bf41e740 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -48,7 +48,7 @@ class CoreExport UserManager
        /** Client list stored by UUID. Contains all clients, and is updated
         * automatically by the constructor and destructor of User.
         */
-       user_hash* uuidlist;
+       user_hash uuidlist;
 
        /** Local client list, a list containing only local clients
         */
@@ -63,10 +63,6 @@ class CoreExport UserManager
         */
        unsigned int unregistered_count;
 
-       /** Number of elements in local_users
-        */
-       unsigned int local_count;
-
        /** Map of global ip addresses for clone counting
         * XXX - this should be private, but m_clones depends on it currently.
         */
@@ -159,7 +155,7 @@ class CoreExport UserManager
        /** Return a count of local registered users
         * @return The number of registered local users
         */
-       unsigned int LocalUserCount() const { return (this->local_count - this->UnregisteredUserCount()); }
+       unsigned int LocalUserCount() const { return (this->local_users.size() - this->UnregisteredUserCount()); }
 
        /** Send a server notice to all local users
         * @param text The text format string to send