Redirect the reader to filters.conf.example for advanced filter configuration

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

diff --git a/include/inspircd.h b/include/inspircd.h
index cda15e61971fa5513f64a07f8db465c05d6ed993..db13b2ab34414c493f0edda12819427d0b9c5538 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -46,6 +46,7 @@
 #include "intrusive_list.h"
 #include "compat.h"
 #include "typedefs.h"
+#include "stdalgo.h"
 
 CoreExport extern InspIRCd* ServerInstance;
 
@@ -371,7 +372,7 @@ class CoreExport InspIRCd
 
        /** Timer manager class, triggers Timer timer events
         */
-       TimerManager* Timers;
+       TimerManager Timers;
 
        /** X-Line manager. Handles G/K/Q/E line setting, removal and matching
         */
@@ -383,7 +384,7 @@ class CoreExport InspIRCd
 
        /** Channel list, a hash_map containing all channels XXX move to channel manager class
         */
-       chan_hash* chanlist;
+       chan_hash chanlist;
 
        /** List of the open ports
         */
@@ -463,7 +464,7 @@ class CoreExport InspIRCd
        /** Get a hash map containing all channels, keyed by their name
         * @return A hash map mapping channel names to Channel pointers
         */
-       chan_hash& GetChans() { return *chanlist; }
+       chan_hash& GetChans() { return chanlist; }
 
        /** Return true if a channel name is valid
         * @param chname A channel name to verify
@@ -671,3 +672,9 @@ class CommandModule : public Module
                return Version(cmd.name, VF_VENDOR|VF_CORE);
        }
 };
+
+inline void stdalgo::culldeleter::operator()(classbase* item)
+{
+       if (item)
+               ServerInstance->GlobalCulls.AddItem(item);
+}