UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the CPluginIterator cache.

Browse Source
This commit is contained in:
David Anderson 2015-09-19 18:13:30 -07:00
parent e57a076dc8
commit 709149fbed
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/logic/PluginSys.cpp
View File

@ -777,12 +777,6 @@ CPluginManager::CPluginManager()
CPluginManager::~CPluginManager() CPluginManager::~CPluginManager()
{ {
CStack<CPluginManager::CPluginIterator *>::iterator iter;
for (iter=m_iters.begin(); iter!=m_iters.end(); iter++)
{
delete (*iter);
}
m_iters.popall();
} }
void CPluginManager::Shutdown() void CPluginManager::Shutdown()
@ -1490,20 +1484,12 @@ void CPluginManager::RemovePluginsListener(IPluginsListener *listener)
IPluginIterator *CPluginManager::GetPluginIterator() IPluginIterator *CPluginManager::GetPluginIterator()
{ {
if (m_iters.empty()) return new CPluginIterator(&m_plugins);
{
return new CPluginIterator(&m_plugins);
} else {
CPluginIterator *iter = m_iters.front();
m_iters.pop();
iter->Reset();
return iter;
}
} }
void CPluginManager::ReleaseIterator(CPluginIterator *iter) void CPluginManager::ReleaseIterator(CPluginIterator *iter)
{ {
m_iters.push(iter); delete iter;
} }
bool CPluginManager::TestAliasMatch(const char *alias, const char *localpath) bool CPluginManager::TestAliasMatch(const char *alias, const char *localpath)

1
core/logic/PluginSys.h
View File

@ -537,7 +537,6 @@ private:
private: private:
List<IPluginsListener *> m_listeners; List<IPluginsListener *> m_listeners;
List<CPlugin *> m_plugins; List<CPlugin *> m_plugins;
CStack<CPluginManager::CPluginIterator *> m_iters;
NameHashSet<CPlugin *> m_LoadLookup; NameHashSet<CPlugin *> m_LoadLookup;
bool m_AllPluginsLoaded; bool m_AllPluginsLoaded;
IdentityToken_t *m_MyIdent; IdentityToken_t *m_MyIdent;