From ea590a5d80741c3bc030cb0a2fcb3c59da4fd078 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 15 Mar 2014 15:29:25 +0100 Subject: Change allocation of UserManager::clientlist to be physically part of the object containing it --- src/users.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/users.cpp') diff --git a/src/users.cpp b/src/users.cpp index e760a3fbc..6a31f0a93 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -697,8 +697,8 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts) InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str()); InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str()); - ServerInstance->Users->clientlist->erase(InUse->nick); - (*(ServerInstance->Users->clientlist))[InUse->uuid] = InUse; + ServerInstance->Users->clientlist.erase(InUse->nick); + ServerInstance->Users->clientlist[InUse->uuid] = InUse; InUse->nick = InUse->uuid; InUse->InvalidateCache(); @@ -721,8 +721,8 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts) nick = newnick; InvalidateCache(); - ServerInstance->Users->clientlist->erase(oldnick); - (*(ServerInstance->Users->clientlist))[newnick] = this; + ServerInstance->Users->clientlist.erase(oldnick); + ServerInstance->Users->clientlist[newnick] = this; if (registered == REG_ALL) FOREACH_MOD(OnUserPostNick, (this,oldnick)); -- cgit v1.3.1-10-gc9f91