Merge pull request #591 from SaberUK/master+config-tweaks

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

diff --git a/include/base.h b/include/base.h
index 8324d63472c628c225a2957f5ebcdd8021c2b3af..117ffab762c2317d09154138353652553caf8b5a 100644 (file)
--- a/include/base.h
+++ b/include/base.h
@@ -1,22 +1,31 @@
-/*       +------------------------------------+
- *       | 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) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003-2005, 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 __BASE_H__
-#define __BASE_H__
+
+#pragma once
 
 #include <map>
 #include <deque>
 #include <string>
+#include <list>
 
 /** Dummy class to help enforce culls being parent-called up to classbase */
 class CullResult
@@ -52,11 +61,12 @@ class CoreExport interfacebase
 {
  public:
        interfacebase() {}
+       static inline void* operator new(size_t, void* m) { return m; }
  private:
        interfacebase(const interfacebase&);
        void operator=(const interfacebase&);
-       void* operator new(size_t);
-       void operator delete(void*);
+       static void* operator new(size_t);
+       static void operator delete(void*);
 };
 
 /** The base class for inspircd classes that support reference counting.
@@ -79,8 +89,9 @@ class CoreExport refcountbase
        refcountbase();
        virtual ~refcountbase();
        inline unsigned int GetReferenceCount() const { return refcount; }
-       void* operator new(size_t);
-       void operator delete(void*);
+       static inline void* operator new(size_t, void* m) { return m; }
+       static void* operator new(size_t);
+       static void operator delete(void*);
        inline void refcount_inc() const { refcount++; }
        inline bool refcount_dec() const { refcount--; return !refcount; }
  private:
@@ -110,7 +121,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class reference
+class CoreExport reference
 {
        T* value;
  public:
@@ -131,15 +142,33 @@ class reference
                if (value && value->refcount_dec())
                        delete value;
        }
-       inline operator bool() const { return value; }
+
+       inline reference<T>& operator=(T* other)
+       {
+               if (value != other)
+               {
+                       if (value && value->refcount_dec())
+                               delete value;
+                       value = other;
+                       if (value)
+                               value->refcount_inc();
+               }
+
+               return *this;
+       }
+
+       inline operator bool() const { return (value != NULL); }
        inline operator T*() const { return value; }
        inline T* operator->() const { return value; }
        inline T& operator*() const { return *value; }
        inline bool operator<(const reference<T>& other) const { return value < other.value; }
        inline bool operator>(const reference<T>& other) const { return value > other.value; }
+       static inline void* operator new(size_t, void* m) { return m; }
  private:
-       void* operator new(size_t);
-       void operator delete(void*);
+#ifndef _WIN32
+       static void* operator new(size_t);
+       static void operator delete(void*);
+#endif
 };
 
 /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.
@@ -150,14 +179,13 @@ class reference
  */
 class CoreExport CoreException : public std::exception
 {
- protected:
+ public:
        /** Holds the error message to be displayed
         */
        const std::string err;
        /** Source of the exception
         */
        const std::string source;
- public:
        /** Default constructor, just uses the error mesage 'Core threw an exception'.
         */
        CoreException() : err("Core threw an exception"), source("The core") {}
@@ -187,6 +215,7 @@ class CoreExport CoreException : public std::exception
        }
 };
 
+class Module;
 class CoreExport ModuleException : public CoreException
 {
  public:
@@ -200,10 +229,8 @@ typedef const reference<Module> ModuleRef;
 enum ServiceType {
        /** is a Command */
        SERVICE_COMMAND,
-       /** is a channel ModeHandler */
-       SERVICE_CMODE,
-       /** is a user ModeHandler */
-       SERVICE_UMODE,
+       /** is a ModeHandler */
+       SERVICE_MODE,
        /** is a metadata descriptor */
        SERVICE_METADATA,
        /** is a data processing provider (MD5, SQL) */
@@ -213,7 +240,7 @@ enum ServiceType {
 };
 
 /** A structure defining something that a module can provide */
-class CoreExport providerbase : public classbase
+class CoreExport ServiceProvider : public classbase
 {
  public:
        /** Module that is providing this service */
@@ -222,10 +249,8 @@ class CoreExport providerbase : public classbase
        const std::string name;
        /** Type of service (must match object type) */
        const ServiceType service;
-       providerbase(Module* Creator, const std::string& Name, ServiceType Type)
+       ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type)
                : creator(Creator), name(Name), service(Type) {}
-       virtual ~providerbase();
+       virtual ~ServiceProvider();
 };
 
-
-#endif