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. --- include/extensible.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include/extensible.h') diff --git a/include/extensible.h b/include/extensible.h index cf9e4762c..78640fb73 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -25,7 +25,6 @@ /** Base class for logic that extends an Extensible object. */ class CoreExport ExtensionItem : public ServiceProvider - , public usecountbase { public: /** Types of Extensible that an ExtensionItem can apply to. */ @@ -132,7 +131,7 @@ class CoreExport Extensible , public Serializable { public: - typedef insp::flat_map, void*> ExtensibleStore; + typedef insp::flat_map ExtensibleStore; // Friend access for the protected getter/setter friend class ExtensionItem; @@ -155,7 +154,7 @@ class CoreExport Extensible Extensible(); Cullable::Result Cull() override; ~Extensible() override; - void UnhookExtensions(const std::vector>& toRemove); + void UnhookExtensions(const std::vector& toRemove); /** * Free all extension items attached to this Extensible @@ -172,10 +171,10 @@ class CoreExport Extensible class CoreExport ExtensionManager { public: - typedef std::map > ExtMap; + typedef std::map ExtMap; bool Register(ExtensionItem* item); - void BeginUnregister(Module* module, std::vector >& list); + void BeginUnregister(Module* module, std::vector& list); ExtensionItem* GetItem(const std::string& name); /** Get all registered extensions keyed by their names -- cgit v1.3.1-10-gc9f91