summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_channames.cpp4
-rw-r--r--src/modules/m_clearchan.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 1483d8cd7..1fb5b2a40 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -83,12 +83,12 @@ class ModuleChannelNames : public Module
ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
}
Channel::MemberMap& users = c->userlist;
- for (UserMembIter j = users.begin(); j != users.end(); )
+ for (Channel::MemberMap::iterator j = users.begin(); j != users.end(); )
{
if (IS_LOCAL(j->first))
{
// KickUser invalidates the iterator
- UserMembIter it = j++;
+ Channel::MemberMap::iterator it = j++;
c->KickUser(ServerInstance->FakeClient, it, "Channel name no longer valid");
}
else
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 6238b7fdf..5fcec36f1 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -94,10 +94,10 @@ class CommandClearChan : public Command
std::string mask;
// Now remove all local non-opers from the channel
Channel::MemberMap& users = chan->userlist;
- for (UserMembIter i = users.begin(); i != users.end(); )
+ for (Channel::MemberMap::iterator i = users.begin(); i != users.end(); )
{
User* curr = i->first;
- const UserMembIter currit = i;
+ const Channel::MemberMap::iterator currit = i;
++i;
if (!IS_LOCAL(curr) || curr->IsOper())