X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=7e9007a1dc3687061ba0c4b02b35e4c047f1393f;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=cbd43da43fc396f4cfbea7c7f960f21fe0597f17;hpb=1dca8b79edf65c0e5e846cc120f1321fb0a1d15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index cbd43da43..7e9007a1d 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -68,7 +68,6 @@ struct fakederef
 #include "convto.h"
 #include "dynref.h"
 #include "consolecolors.h"
-#include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
 #include "fileutils.h"
@@ -165,8 +164,6 @@ class serverstats
 	}
 };
 
-DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
-
 /** The main class of the irc server.
  * This class contains instances of all the other classes in this software.
  * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
@@ -209,9 +206,6 @@ class CoreExport InspIRCd
 	/** Actions that must happen outside of the current call stack */
 	ActionList AtomicActions;
 
-	/**** Functors ****/
-	GenRandomHandler HandleGenRandom;
-
 	/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
 	 * Reason for it:
 	 * kludge alert!
@@ -339,7 +333,14 @@ class CoreExport InspIRCd
 	unsigned long GenRandomInt(unsigned long max);
 
 	/** Fill a buffer with random bits */
-	caller2<void, char*, size_t> GenRandom;
+	TR1NS::function<void(char*, size_t)> GenRandom;
+
+	/** Fills the output buffer with the specified number of random characters.
+	 * This is the default function for InspIRCd::GenRandom.
+	 * @param output The output buffer to store random characters in.
+	 * @param max The maximum number of random characters to put in the buffer.
+	 */
+	static void DefaultGenRandom(char* output, size_t max);
 
 	/** Bind all ports specified in the configuration file.
 	 * @return The number of ports bound without error