Merge pull request #1335 from SaberUK/master+se

[user/henk/code/inspircd.git] / src / modmanager_static.cpp

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 76f16fa92fd140e2594a0ab9062c70b46c99f2b2..5c04a76800f6e211afbfea316c0ca4ea11cd45f4 100644 (file)
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -23,7 +23,7 @@
 #include "exitcodes.h"
 #include <iostream>
 
-#ifdef PURE_STATIC
+#ifdef INSPIRCD_STATIC
 
 typedef std::map<std::string, AllModuleList*> modmap;
 static std::vector<AllCommandList::fn>* cmdlist = NULL;
@@ -69,8 +69,7 @@ class AllModule : public Module
 
        ~AllModule()
        {
-               for(std::vector<Command*>::iterator i = cmds.begin(); i != cmds.end(); ++i)
-                       delete *i;
+               stdalgo::delete_all(cmds);
        }
 
        Version GetVersion()
@@ -81,8 +80,9 @@ class AllModule : public Module
 
 MODULE_INIT(AllModule)
 
-bool ModuleManager::Load(const std::string& name, bool defer)
+bool ModuleManager::Load(const std::string& inputname, bool defer)
 {
+       const std::string name = ExpandModName(inputname);
        modmap::iterator it = modlist->find(name);
        if (it == modlist->end())
                return false;