summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-08 04:02:05 +0000
committerspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-08 04:02:05 +0000
commitbc6df4be67d1cdac0e22a7d86d312c0e1b0436c9 (patch)
treedd561a3b3fe2329f2c4c440ec37bcce8f8d32e09
parent2d5089f291ee2258a39f3f2b4372e9a686ee6ea0 (diff)
This should fix the empty iterator crash with gcc3.3 - thanks yet again to peaveydk for spending hours finding the issue and for the patch
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5662 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/configreader.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/configreader.h b/include/configreader.h
index cce4e0f9d..e0bab84bd 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -75,7 +75,7 @@ typedef std::map<irc::string,char*> opertype_t;
/** A Set of oper classes
*/
-typedef opertype_t operclass_t;
+typedef std::map<irc::string,char*> operclass_t;
/** This class holds the bulk of the runtime configuration for the ircd.
@@ -115,11 +115,20 @@ class ServerConfig : public Extensible
InspIRCd* GetInstance();
+
+ /** All oper class definitions from the config file
+ */
+ operclass_t operclass;
+
/** This holds all the information in the config file,
* it's indexed by tag name to a vector of key/values.
*/
ConfigDataHash config_data;
+ /* All oper type definitions from the config file
+ */
+ opertype_t opertypes;
+
/** Holds the server name of the local server
* as defined by the administrator.
*/
@@ -392,14 +401,6 @@ class ServerConfig : public Extensible
*/
bool CycleHosts;
- /* All oper type definitions from the config file
- */
- opertype_t opertypes;
-
- /** All oper class definitions from the config file
- */
- operclass_t operclass;
-
/** Construct a new ServerConfig
*/
ServerConfig(InspIRCd* Instance);