diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-12-19 15:24:02 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-12-19 15:24:02 +0100 |
| commit | c44433dad279aa8ad95fc936ce5d3c671fbf9aa3 (patch) | |
| tree | ea03fa09e688a36f8e75f137954e60b762404b2a /include/mode.h | |
| parent | 6d25ad273c7fd1d21b9c392678f3472eb53c6e83 (diff) | |
| parent | 7010a92426d2c3ab0cea5ba0d36a04bc6b52349f (diff) | |
Merge branch 'master+flatmap'
Diffstat (limited to 'include/mode.h')
| -rw-r--r-- | include/mode.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/mode.h b/include/mode.h index 364562dd7..eebfbedd6 100644 --- a/include/mode.h +++ b/include/mode.h @@ -473,8 +473,6 @@ class CoreExport ModeWatcher : public classbase virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding); }; -typedef std::multimap<std::string, ModeWatcher*>::iterator ModeWatchIter; - /** The mode parser handles routing of modes and handling of mode strings. * It marshalls, controls and maintains both ModeWatcher and ModeHandler classes, * parses client to server MODE strings for user and channel modes, and performs @@ -490,6 +488,10 @@ class CoreExport ModeParser : public fakederef<ModeParser> typedef TR1NS::unordered_map<std::string, ModeHandler*, irc::insensitive, irc::StrHashComp> ModeHandlerMap; private: + /** Type of the container that maps mode names to ModeWatchers + */ + typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap; + /** Last item in the ModeType enum */ static const unsigned int MODETYPE_LAST = 2; @@ -524,7 +526,7 @@ class CoreExport ModeParser : public fakederef<ModeParser> /** Mode watcher classes */ - std::multimap<std::string, ModeWatcher*> modewatchermap; + ModeWatcherMap modewatchermap; /** Last processed mode change */ |