From dd5e75f99e37fc8e407da6fc003fcfa56b802752 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 26 Nov 2015 13:39:56 +0100 Subject: [PATCH 1/1] Add typedef ExtensionManager::ExtMap --- include/extensible.h | 6 +++++- src/base.cpp | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/extensible.h b/include/extensible.h index a2c104377..b98bb921f 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -121,11 +121,15 @@ class CoreExport Extensible : public classbase class CoreExport ExtensionManager { - std::map > types; public: + typedef std::map > ExtMap; + bool Register(ExtensionItem* item); void BeginUnregister(Module* module, std::vector >& list); ExtensionItem* GetItem(const std::string& name); + + private: + ExtMap types; }; /** Base class for items that are NOT synchronized between servers */ diff --git a/src/base.cpp b/src/base.cpp index 67b136ec8..c268c7493 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -147,10 +147,10 @@ bool ExtensionManager::Register(ExtensionItem* item) void ExtensionManager::BeginUnregister(Module* module, std::vector >& list) { - std::map >::iterator i = types.begin(); + ExtMap::iterator i = types.begin(); while (i != types.end()) { - std::map >::iterator me = i++; + ExtMap::iterator me = i++; ExtensionItem* item = me->second; if (item->creator == module) { @@ -162,7 +162,7 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector >::iterator i = types.find(name); + ExtMap::iterator i = types.find(name); if (i == types.end()) return NULL; return i->second; -- 2.39.2