aboutsummaryrefslogtreecommitdiff
path: root/src/modmanager_dynamic.cpp
diff options
context:
space:
mode:
authorGravatar Jackmcbarn2011-01-29 16:29:33 -0500
committerGravatar Jackmcbarn2011-01-29 16:29:33 -0500
commit5dbabb823456744e7442edc2bfde1272bb2edcb1 (patch)
tree9ca74394c3d59592b7cd70f64b1b37faaab3f02c /src/modmanager_dynamic.cpp
parentRemove protocol.h from inspircd.h (diff)
Remove cull_list.h from inspircd.h
Diffstat (limited to 'src/modmanager_dynamic.cpp')
-rw-r--r--src/modmanager_dynamic.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 03e0e7fb6..7568bd828 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -12,6 +12,7 @@
*/
#include "inspircd.h"
+#include "cull_list.h"
#include "xline.h"
#include "exitcodes.h"
@@ -114,9 +115,9 @@ namespace {
{
DLLManager* dll = mod->ModuleDLLManager;
ServerInstance->Modules->DoSafeUnload(mod, NULL);
- ServerInstance->GlobalCulls.Apply();
+ ServerInstance->GlobalCulls->Apply();
delete dll;
- ServerInstance->GlobalCulls.AddItem(this);
+ ServerInstance->GlobalCulls->AddItem(this);
}
};
@@ -132,12 +133,12 @@ namespace {
DLLManager* dll = mod->ModuleDLLManager;
std::string name = mod->ModuleSourceFile;
ServerInstance->Modules->DoSafeUnload(mod, &state);
- ServerInstance->GlobalCulls.Apply();
+ ServerInstance->GlobalCulls->Apply();
delete dll;
bool rv = ServerInstance->Modules->Load(name.c_str(), false, &state);
if (callback)
callback->Call(rv);
- ServerInstance->GlobalCulls.AddItem(this);
+ ServerInstance->GlobalCulls->AddItem(this);
}
};
}
@@ -146,14 +147,14 @@ bool ModuleManager::Unload(Module* mod)
{
if (!CanUnload(mod))
return false;
- ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
+ ServerInstance->AtomicActions->AddAction(new UnloadAction(mod));
return true;
}
void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
{
if (CanUnload(mod))
- ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
+ ServerInstance->AtomicActions->AddAction(new ReloadAction(mod, callback));
else
callback->Call(false);
}