m_callerid Use std::find() where possible

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

diff --git a/include/caller.h b/include/caller.h
index 66603575221e794e395b315606738b522c81d2d1..88e7df4a1349015623d24af1572299daa2d801b0 100644 (file)
--- a/include/caller.h
+++ b/include/caller.h
@@ -1,18 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CALLER__H__
-#define __CALLER__H__
+
+#ifndef CALLER_H
+#define CALLER_H
 
 /** The templates below can be auto generated by tools/create_templates.pl.
  * They are used to represent a functor with a given number of parameters and
@@ -47,63 +54,63 @@
  * this until you do, as if you get this wrong, this can generate some pretty long
  * winded and confusing error messages at compile time.
  */
-template <typename ReturnType> class CoreExport HandlerBase0
+template <typename ReturnType> class CoreExport HandlerBase0 : public classbase
 {
  public:
        virtual ReturnType Call() = 0;
        virtual ~HandlerBase0() { }
 };
 
-template <typename ReturnType, typename Param1> class CoreExport HandlerBase1
+template <typename ReturnType, typename Param1> class CoreExport HandlerBase1 : public classbase
 {
  public:
        virtual ReturnType Call(Param1) = 0;
        virtual ~HandlerBase1() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2> class CoreExport HandlerBase2
+template <typename ReturnType, typename Param1, typename Param2> class CoreExport HandlerBase2 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2) = 0;
        virtual ~HandlerBase2() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3> class CoreExport HandlerBase3
+template <typename ReturnType, typename Param1, typename Param2, typename Param3> class CoreExport HandlerBase3 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3) = 0;
        virtual ~HandlerBase3() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4> class CoreExport HandlerBase4
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4> class CoreExport HandlerBase4 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3, Param4) = 0;
        virtual ~HandlerBase4() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5> class CoreExport HandlerBase5
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5> class CoreExport HandlerBase5 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3, Param4, Param5) = 0;
        virtual ~HandlerBase5() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6> class CoreExport HandlerBase6
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6> class CoreExport HandlerBase6 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3, Param4, Param5, Param6) = 0;
        virtual ~HandlerBase6() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7> class CoreExport HandlerBase7
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7> class CoreExport HandlerBase7 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3, Param4, Param5, Param6, Param7) = 0;
        virtual ~HandlerBase7() { }
 };
 
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7, typename Param8> class CoreExport HandlerBase8
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7, typename Param8> class CoreExport HandlerBase8 : public classbase
 {
  public:
        virtual ReturnType Call(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) = 0;
@@ -120,12 +127,6 @@ template <typename HandlerType> class CoreExport caller
        { }
 
        virtual ~caller() { }
-
-       caller& operator=(HandlerType* newtarget)
-       {
-               target = newtarget;
-               return *this;
-       }
 };
 
 template <typename ReturnType> class CoreExport caller0 : public caller< HandlerBase0<ReturnType> >