Add SocketEngine::WriteV()

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

diff --git a/include/configreader.h b/include/configreader.h
index 66bb97ea02a4cb8de439d518e16943213bda161f..57d7ab069741a1f68869183005b705a1a1ffabba 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -117,14 +117,6 @@ class ServerLimits
        /** Maximum hostname length */
        size_t MaxHost;
 
-       /** Creating the class initialises it to the defaults
-        * as in 1.1's ./configure script. Reading other values
-        * from the config will change these values.
-        */
-       ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
-               MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-               MaxLine(512), MaxHost(64) { }
-
        /** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
         * @param tag Configuration tag to read the limits from
         */
@@ -170,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;
@@ -238,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