Change to new execution directory structure

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

diff --git a/include/extensible.h b/include/extensible.h
index d3d22a97ed4c234b69688536d93833540c1ca6d8..3e6bd4c993dbb6fd6a8b5ad98ab2ba37305f1973 100644 (file)
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -21,6 +21,7 @@ class CoreExport ExtensionItem
        const std::string key;
        Module* const owner;
        ExtensionItem(const std::string& key, Module* owner);
+       virtual ~ExtensionItem();
        /** Serialize this item into a string
         *
         * @param format The format to serialize to
@@ -47,7 +48,7 @@ class CoreExport ExtensionItem
 };
 
 /** A private data store for an Extensible class */
-typedef std::map<std::string,void*> ExtensibleStore;
+CoreExport typedef std::map<std::string,void*> ExtensibleStore;
 
 /** class Extensible is the parent class of many classes such as User and Channel.
  * class Extensible implements a system which allows modules to 'extend' the class by attaching data within
@@ -83,7 +84,7 @@ class CoreExport Extensible : public classbase
        static bool Register(ExtensionItem* item);
        static std::vector<ExtensionItem*> BeginUnregister(Module* module);
        void doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove);
-       
+
        // Friend access for the protected getter/setter
        friend class ExtensionItem;
 };
@@ -93,19 +94,24 @@ class CoreExport LocalExtItem : public ExtensionItem
 {
  public:
        LocalExtItem(const std::string& key, Module* owner);
+       virtual ~LocalExtItem();
        virtual std::string serialize(SerializeFormat format, const Extensible* container, void* item);
        virtual void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
        virtual void free(void* item) = 0;
 };
 
 template<typename T>
-class CoreExport SimpleExtItem : public LocalExtItem
+class SimpleExtItem : public LocalExtItem
 {
  public:
        SimpleExtItem(const std::string& Key, Module* parent) : LocalExtItem(Key, parent)
        {
        }
 
+       virtual ~SimpleExtItem()
+       {
+       }
+
        inline T* get(const Extensible* container)
        {
                return static_cast<T*>(get_raw(container));
@@ -151,6 +157,7 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string>
 {
  public:
        LocalStringExt(const std::string& key, Module* owner);
+       virtual ~LocalStringExt();
        std::string serialize(SerializeFormat format, const Extensible* container, void* item);
 };
 
@@ -158,6 +165,7 @@ class CoreExport LocalIntExt : public LocalExtItem
 {
  public:
        LocalIntExt(const std::string& key, Module* owner);
+       virtual ~LocalIntExt();
        std::string serialize(SerializeFormat format, const Extensible* container, void* item);
        intptr_t get(const Extensible* container);
        intptr_t set(Extensible* container, intptr_t value);
@@ -168,6 +176,7 @@ class CoreExport StringExtItem : public ExtensionItem
 {
  public:
        StringExtItem(const std::string& key, Module* owner);
+       virtual ~StringExtItem();
        std::string* get(const Extensible* container);
        std::string serialize(SerializeFormat format, const Extensible* container, void* item);
        void unserialize(SerializeFormat format, Extensible* container, const std::string& value);