Merge branch 'master+gnutlsprio'

[user/henk/code/inspircd.git] / src / modules / m_hostcycle.cpp

diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp
index d3646e89935cd71daba33afd6ca9f36e5bcf14d2..d4def647347e9e3fa0fbf4366cc85390661afa54 100644 (file)
--- a/src/modules/m_hostcycle.cpp
+++ b/src/modules/m_hostcycle.cpp
@@ -29,8 +29,8 @@ class ModuleHostCycle : public Module
                // GetFullHost() returns the original data at the time this function is called
                const std::string quitline = ":" + user->GetFullHost() + " QUIT :" + quitmsg;
 
-               already_sent_t silent_id = ++LocalUser::already_sent_id;
-               already_sent_t seen_id = ++LocalUser::already_sent_id;
+               already_sent_t silent_id = ServerInstance->Users.NextAlreadySentId();
+               already_sent_t seen_id = ServerInstance->Users.NextAlreadySentId();
 
                IncludeChanList include_chans(user->chans.begin(), user->chans.end());
                std::map<User*,bool> exceptions;
@@ -72,8 +72,8 @@ class ModuleHostCycle : public Module
                                        modeline.append(" ").append(user->nick);
                        }
 
-                       const UserMembList* ulist = c->GetUsers();
-                       for (UserMembList::const_iterator j = ulist->begin(); j != ulist->end(); ++j)
+                       const Channel::MemberMap& ulist = c->GetUsers();
+                       for (Channel::MemberMap::const_iterator j = ulist.begin(); j != ulist.end(); ++j)
                        {
                                LocalUser* u = IS_LOCAL(j->first);
                                if (u == NULL || u == user)