summaryrefslogtreecommitdiff
path: root/src/chanserv.cpp
diff options
context:
space:
mode:
authorDukePyrolator <DukePyrolator@anope.org>2010-12-26 09:36:45 +0100
committerDukePyrolator <DukePyrolator@anope.org>2010-12-26 09:36:45 +0100
commitf638d1078ab5ab630ce9393fe87edd630abdf75a (patch)
tree2afbda6b0a653324657e41d3ddc8a698a37e3b29 /src/chanserv.cpp
parent4235df2b28a26cb166a250d016f1fd9b417cb94b (diff)
parent8af2465a61b09e020c1324acfb78bbf912869fc8 (diff)
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src/chanserv.cpp')
-rw-r--r--src/chanserv.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chanserv.cpp b/src/chanserv.cpp
index 504bdea2a..35fd8975c 100644
--- a/src/chanserv.cpp
+++ b/src/chanserv.cpp
@@ -111,7 +111,7 @@ Anope::string get_mlock_modes(ChannelInfo *ci, int complete)
{
Anope::string pos = "+", neg = "-", params;
- for (std::map<ChannelModeName, ModeLock>::const_iterator it = ci->GetMLock().begin(), it_end = ci->GetMLock().end(); it != it_end; ++it)
+ for (std::multimap<ChannelModeName, ModeLock>::const_iterator it = ci->GetMLock().begin(), it_end = ci->GetMLock().end(); it != it_end; ++it)
{
const ModeLock &ml = it->second;
ChannelMode *cm = ModeManager::FindChannelModeByName(ml.name);
@@ -241,7 +241,7 @@ void check_modes(Channel *c)
return;
}
- for (std::map<ChannelModeName, ModeLock>::const_iterator it = ci->GetMLock().begin(), it_end = ci->GetMLock().end(); it != it_end; ++it)
+ for (std::multimap<ChannelModeName, ModeLock>::const_iterator it = ci->GetMLock().begin(), it_end = ci->GetMLock().end(); it != it_end; ++it)
{
const ModeLock &ml = it->second;
ChannelMode *cm = ModeManager::FindChannelModeByName(ml.name);