Merge branch 'master+gnutlsprio'

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index 88279004fbb3a2c46e3c450d0f060a61429f2a28..9b73dd3c630a095fdc5e3e59889a25e86fcff670 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -162,8 +162,9 @@ struct CommandLineConf
 class CoreExport OperInfo : public refcountbase
 {
  public:
-       std::set<std::string> AllowedOperCommands;
-       std::set<std::string> AllowedPrivs;
+       typedef insp::flat_set<std::string> PrivSet;
+       PrivSet AllowedOperCommands;
+       PrivSet AllowedPrivs;
 
        /** Allowed user modes from oper classes. */
        std::bitset<64> AllowedUserModes;
@@ -230,7 +231,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
@@ -494,10 +495,6 @@ class CoreExport ServerConfig
         */
        static std::string Escape(const std::string& str, bool xml = true);
 
-       /** If this value is true, invites will bypass more than just +i
-        */
-       bool InvBypassModes;
-
        /** If this value is true, snotices will not stack when repeats are sent
         */
        bool NoSnoticeStack;