From 8c2cdeaf33bf6fa2d51df0e6e2c0cbdfc3e1230b Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 27 Sep 2014 18:30:01 +0200 Subject: [PATCH] Store Membership objects physically in the nodes of Channel::MemberMap --- include/channels.h | 2 +- src/channels.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/channels.h b/include/channels.h index eeb2501fa..2b7c5d025 100644 --- a/include/channels.h +++ b/include/channels.h @@ -39,7 +39,7 @@ class CoreExport Channel : public Extensible, public InviteBase public: /** A map of Memberships on a channel keyed by User pointers */ - typedef std::map MemberMap; + typedef std::map > MemberMap; private: /** Set default modes for the channel on creation diff --git a/src/channels.cpp b/src/channels.cpp index 13595c4c3..2ea8688cf 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -61,11 +61,11 @@ void Channel::SetTopic(User* u, const std::string& ntopic) Membership* Channel::AddUser(User* user) { - Membership*& memb = userlist[user]; - if (memb) + std::pair ret = userlist.insert(std::make_pair(user, insp::aligned_storage())); + if (!ret.second) return NULL; - memb = new Membership(user, this); + Membership* memb = new(ret.first->second) Membership(user, this); return memb; } @@ -102,7 +102,7 @@ void Channel::DelUser(const MemberMap::iterator& membiter) { Membership* memb = membiter->second; memb->cull(); - delete memb; + memb->~Membership(); userlist.erase(membiter); // If this channel became empty then it should be removed -- 2.39.5