diff options
| author | Adam <Adam@anope.org> | 2012-12-28 13:00:36 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-12-28 13:00:36 -0500 |
| commit | 761849083da3a523eeb3b2293311cfee1c29df35 (patch) | |
| tree | 2994a687fcfa4b7e60c5c5f4f36cbbed0a370963 /src/modes.cpp | |
| parent | ae6ddf295af63e2e201863646f4a4b535a966096 (diff) | |
Dumb iterators
Diffstat (limited to 'src/modes.cpp')
| -rw-r--r-- | src/modes.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/modes.cpp b/src/modes.cpp index ae550d788..5bc9e18f5 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -573,20 +573,18 @@ void ModeManager::StackerDel(Mode *m) for (std::list<std::pair<Mode *, Anope::string> >::iterator it2 = si->AddModes.begin(), it2_end = si->AddModes.end(); it2 != it2_end;) { - Mode *mode = it2->first; - ++it2; - - if (mode == m) - si->AddModes.erase(it2); + if (it2->first == m) + it2 = si->AddModes.erase(it2); + else + ++it2; } for (std::list<std::pair<Mode *, Anope::string> >::iterator it2 = si->DelModes.begin(), it2_end = si->DelModes.end(); it2 != it2_end;) { - Mode *mode = it2->first; - ++it2; - - if (mode == m) - si->DelModes.erase(it2); + if (it2->first == m) + it2 = si->DelModes.erase(it2); + else + ++it2; } } @@ -597,20 +595,18 @@ void ModeManager::StackerDel(Mode *m) for (std::list<std::pair<Mode *, Anope::string> >::iterator it2 = si->AddModes.begin(), it2_end = si->AddModes.end(); it2 != it2_end;) { - Mode *mode = it2->first; - ++it2; - - if (mode == m) - si->AddModes.erase(it2); + if (it2->first == m) + it2 = si->AddModes.erase(it2); + else + ++it2; } for (std::list<std::pair<Mode *, Anope::string> >::iterator it2 = si->DelModes.begin(), it2_end = si->DelModes.end(); it2 != it2_end;) { - Mode *mode = it2->first; - ++it2; - - if (mode == m) - si->DelModes.erase(it2); + if (it2->first == m) + it2 = si->DelModes.erase(it2); + else + ++it2; } } } |