X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=db7258d4e2b8114805eea909017f75ffcc29f789;hb=8920cb1b9f2c0b50ca326e5fa0646db40acccdbc;hp=9fcb9c6a333f72a12fed7dfc08a1201c91092c53;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 9fcb9c6a3..db7258d4e 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -31,6 +31,7 @@
 #include "modules.h"
 #include "socketengine.h"
 #include "socket.h"
+#include "token_list.h"
 
 /** Structure representing a single \<tag> in config */
 class CoreExport ConfigTag : public refcountbase
@@ -165,9 +166,8 @@ struct CommandLineConf
 class CoreExport OperInfo : public refcountbase
 {
  public:
-	typedef insp::flat_set<std::string> PrivSet;
-	PrivSet AllowedOperCommands;
-	PrivSet AllowedPrivs;
+	TokenList AllowedOperCommands;
+	TokenList AllowedPrivs;
 
 	/** Allowed user modes from oper classes. */
 	std::bitset<64> AllowedUserModes;
@@ -285,12 +285,12 @@ class CoreExport ServerConfig
 	/** Clones CIDR range for ipv4 (0-32)
 	 * Defaults to 32 (checks clones on all IPs seperately)
 	 */
-	int c_ipv4_range;
+	unsigned char c_ipv4_range;
 
 	/** Clones CIDR range for ipv6 (0-128)
 	 * Defaults to 128 (checks on all IPs seperately)
 	 */
-	int c_ipv6_range;
+	unsigned char c_ipv6_range;
 
 	/** Holds the server name of the local server
 	 * as defined by the administrator.
@@ -516,7 +516,7 @@ class CoreExport ConfigReaderThread : public Thread
 		delete Config;
 	}
 
-	void Run();
+	void Run() CXX11_OVERRIDE;
 	/** Run in the main thread to apply the configuration */
 	void Finish();
 	bool IsDone() { return done; }