From c1a07677db2bb0b023d5eb3565353cb0843eefbf Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Tue, 13 Apr 2010 12:47:42 -0500 Subject: Change UserChanList to an intrusive-style linked list --- src/channels.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/channels.cpp') diff --git a/src/channels.cpp b/src/channels.cpp index d8ed730e9..362d16583 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -363,7 +363,7 @@ Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, std::string nick = user->nick; Membership* memb = Ptr->AddUser(user); - user->chans.insert(Ptr); + user->chans.insert(memb); for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++) { @@ -498,7 +498,7 @@ void Channel::PartUser(User *user, std::string &reason) WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str()); - user->chans.erase(this); + user->chans.erase(memb); this->RemoveAllPrefixes(user); } @@ -556,7 +556,7 @@ void Channel::KickUser(User *src, User *user, const char* reason) WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason); - user->chans.erase(this); + user->chans.erase(memb); this->RemoveAllPrefixes(user); } -- cgit v1.3.1-10-gc9f91