From 709149fbede627ee03a1a336c8d02c8b9afbfa39 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 19 Sep 2015 18:13:30 -0700 Subject: [PATCH] Remove the CPluginIterator cache. --- core/logic/PluginSys.cpp | 18 ++---------------- core/logic/PluginSys.h | 1 - 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/core/logic/PluginSys.cpp b/core/logic/PluginSys.cpp index 94a40f86..3accd8fe 100644 --- a/core/logic/PluginSys.cpp +++ b/core/logic/PluginSys.cpp @@ -777,12 +777,6 @@ CPluginManager::CPluginManager() CPluginManager::~CPluginManager() { - CStack::iterator iter; - for (iter=m_iters.begin(); iter!=m_iters.end(); iter++) - { - delete (*iter); - } - m_iters.popall(); } void CPluginManager::Shutdown() @@ -1490,20 +1484,12 @@ void CPluginManager::RemovePluginsListener(IPluginsListener *listener) IPluginIterator *CPluginManager::GetPluginIterator() { - if (m_iters.empty()) - { - return new CPluginIterator(&m_plugins); - } else { - CPluginIterator *iter = m_iters.front(); - m_iters.pop(); - iter->Reset(); - return iter; - } + return new CPluginIterator(&m_plugins); } void CPluginManager::ReleaseIterator(CPluginIterator *iter) { - m_iters.push(iter); + delete iter; } bool CPluginManager::TestAliasMatch(const char *alias, const char *localpath) diff --git a/core/logic/PluginSys.h b/core/logic/PluginSys.h index 88537525..b8830663 100644 --- a/core/logic/PluginSys.h +++ b/core/logic/PluginSys.h @@ -537,7 +537,6 @@ private: private: List m_listeners; List m_plugins; - CStack m_iters; NameHashSet m_LoadLookup; bool m_AllPluginsLoaded; IdentityToken_t *m_MyIdent;