diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-12-15 17:48:52 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-12-15 17:48:52 +0100 |
| commit | 7010a92426d2c3ab0cea5ba0d36a04bc6b52349f (patch) | |
| tree | aa429d64a117ac66ee934a618dc68ce270ff4df5 /include | |
| parent | 3eed53a5bb3b8460c6732237f690fe623d70f167 (diff) | |
Change type of some associative containers to their flat versions, including Extensible storage
Diffstat (limited to 'include')
| -rw-r--r-- | include/configparser.h | 2 | ||||
| -rw-r--r-- | include/configreader.h | 4 | ||||
| -rw-r--r-- | include/extensible.h | 2 | ||||
| -rw-r--r-- | include/mode.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/configparser.h b/include/configparser.h index f46d143ae..02619e759 100644 --- a/include/configparser.h +++ b/include/configparser.h @@ -41,7 +41,7 @@ enum ParseFlags struct ParseStack { std::vector<std::string> reading; - std::map<std::string, std::string> vars; + insp::flat_map<std::string, std::string> vars; ConfigDataHash& output; ConfigFileCache& FilesOutput; std::stringstream& errstr; diff --git a/include/configreader.h b/include/configreader.h index 35fa178a9..da81d5055 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -165,7 +165,7 @@ struct CommandLineConf class CoreExport OperInfo : public refcountbase { public: - typedef std::set<std::string> PrivSet; + typedef insp::flat_set<std::string> PrivSet; PrivSet AllowedOperCommands; PrivSet AllowedPrivs; @@ -234,7 +234,7 @@ class CoreExport ServerConfig /** Index of valid oper blocks and types */ - typedef std::map<std::string, reference<OperInfo> > OperIndex; + typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex; /** Get a configuration tag * @param tag The name of the tag to get diff --git a/include/extensible.h b/include/extensible.h index 87fe65ccb..86e0d6b07 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -75,7 +75,7 @@ class CoreExport ExtensionItem : public ServiceProvider, public usecountbase class CoreExport Extensible : public classbase { public: - typedef std::map<reference<ExtensionItem>,void*> ExtensibleStore; + typedef insp::flat_map<reference<ExtensionItem>, void*> ExtensibleStore; // Friend access for the protected getter/setter friend class ExtensionItem; diff --git a/include/mode.h b/include/mode.h index 1c2bd8f44..eebfbedd6 100644 --- a/include/mode.h +++ b/include/mode.h @@ -490,7 +490,7 @@ class CoreExport ModeParser : public fakederef<ModeParser> private: /** Type of the container that maps mode names to ModeWatchers */ - typedef std::multimap<std::string, ModeWatcher*> ModeWatcherMap; + typedef insp::flat_multimap<std::string, ModeWatcher*> ModeWatcherMap; /** Last item in the ModeType enum */ |