From 5dc87c938ab756aebda2d4e1fdd75136e5103f07 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 8 Apr 2021 23:58:23 +0100 Subject: Remove usecountbase from ExtensionItem and refer to using pointers. At one point (1.2?) this was actually useful but nowadays its not. --- src/extensible.cpp | 4 ++-- src/modules.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/extensible.cpp b/src/extensible.cpp index 88230ae9a..5055dd091 100644 --- a/src/extensible.cpp +++ b/src/extensible.cpp @@ -24,7 +24,7 @@ bool ExtensionManager::Register(ExtensionItem* item) return types.emplace(item->name, item).second; } -void ExtensionManager::BeginUnregister(Module* module, std::vector>& items) +void ExtensionManager::BeginUnregister(Module* module, std::vector& items) { for (ExtMap::iterator type = types.begin(); type != types.end(); ) { @@ -75,7 +75,7 @@ void Extensible::FreeAllExtItems() extensions.clear(); } -void Extensible::UnhookExtensions(const std::vector>& items) +void Extensible::UnhookExtensions(const std::vector& items) { for (const auto& item : items) { diff --git a/src/modules.cpp b/src/modules.cpp index 8315a7cce..54b3c2c66 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -389,7 +389,7 @@ void ModuleManager::DoSafeUnload(Module* mod) UnregisterModes(mod, MODETYPE_USER); UnregisterModes(mod, MODETYPE_CHANNEL); - std::vector > items; + std::vector items; ServerInstance->Extensions.BeginUnregister(modfind->second, items); /* Give the module a chance to tidy out all its metadata */ const chan_hash& chans = ServerInstance->GetChans(); -- cgit v1.3.1-10-gc9f91