summaryrefslogtreecommitdiff
path: root/include/dynamic.h
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-26 14:13:13 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-26 14:13:13 +0000
commit6d03943426dcce76ba66567a9b18425a5ebb4c0c (patch)
treebedffa6d2a65a9ef556405224a6d7a181c8a1ba5 /include/dynamic.h
parent810c662c9b55908101ca085293c52c3239ef22d1 (diff)
Remove InspIRCd* parameters and fields
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11763 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include/dynamic.h')
-rw-r--r--include/dynamic.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/include/dynamic.h b/include/dynamic.h
index 4b8c7a456..19ff7bdaf 100644
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -27,11 +27,10 @@ class CoreExport DLLManager
public:
/** This constructor loads the module using dlopen()
- * @param ServerInstance The creator class of this object
* @param fname The filename to load. This should be within
* the modules dir.
*/
- DLLManager(InspIRCd* ServerInstance, const char *fname);
+ DLLManager(const char *fname);
virtual ~DLLManager();
/** Get a symbol using dynamic linking.
@@ -102,16 +101,12 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
* The init_module function is the only exported extern "C" declaration
* in any module file. In a cmd_*.cpp file the equivilant is init_command
*/
- typedef ReturnType * (initfunctype) (InspIRCd*);
+ typedef ReturnType * (initfunctype) ();
/** Pointer to the init function.
*/
initfunctype* init_func;
- /** Instance pointer to be passed to init_*() when it is called.
- */
- InspIRCd* ServerInstance;
-
public:
/** Default constructor.
* This constructor passes its paramerers down through DLLFactoryBase and then DLLManager
@@ -119,8 +114,8 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
* class. It is then down to the core to call the ModuleFactory::CreateModule() method and
* receive a Module* which it can insert into its module lists.
*/
- DLLFactory(InspIRCd* Instance, const char *fname, const char *func_name)
- : DLLManager(Instance, fname), init_func(NULL), ServerInstance(Instance)
+ DLLFactory(const char *fname, const char *func_name)
+ : DLLManager(fname), init_func(NULL)
{
const char* error = LastError();
@@ -144,7 +139,7 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
{
if(init_func)
{
- return init_func(ServerInstance);
+ return init_func();
}
else
{