From 641b2d07ab6868a9fa6726c1bc36cde80005e155 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 7 Feb 2019 12:16:33 +0000 Subject: ModuleManager: remove fakederef. --- src/modules.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules.cpp') diff --git a/src/modules.cpp b/src/modules.cpp index 1107d8e7d..56ddc5a11 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -71,7 +71,7 @@ Module::~Module() void Module::DetachEvent(Implementation i) { - ServerInstance->Modules->Detach(i, this); + ServerInstance->Modules.Detach(i, this); } void Module::ReadConfig(ConfigStatus& status) { } @@ -151,14 +151,14 @@ void Module::OnRunTestSuite() { } ServiceProvider::ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type) : creator(Creator), name(Name), service(Type) { - if ((ServerInstance) && (ServerInstance->Modules->NewServices)) - ServerInstance->Modules->NewServices->push_back(this); + if ((ServerInstance) && (ServerInstance->Modules.NewServices)) + ServerInstance->Modules.NewServices->push_back(this); } void ServiceProvider::DisableAutoRegister() { - if ((ServerInstance) && (ServerInstance->Modules->NewServices)) - stdalgo::erase(*ServerInstance->Modules->NewServices, this); + if ((ServerInstance) && (ServerInstance->Modules.NewServices)) + stdalgo::erase(*ServerInstance->Modules.NewServices, this); } ModuleManager::ModuleManager() @@ -449,7 +449,7 @@ namespace void Call() override { DLLManager* dll = mod->ModuleDLLManager; - ServerInstance->Modules->DoSafeUnload(mod); + ServerInstance->Modules.DoSafeUnload(mod); ServerInstance->GlobalCulls.Apply(); // In pure static mode this is always NULL delete dll; -- cgit v1.3.1-10-gc9f91