diff options
Diffstat (limited to 'src/modules/modules.cpp.in')
| -rw-r--r-- | src/modules/modules.cpp.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/modules.cpp.in b/src/modules/modules.cpp.in index e3feba1..a6a2147 100644 --- a/src/modules/modules.cpp.in +++ b/src/modules/modules.cpp.in @@ -17,7 +17,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "modules.h" +#include <modules/modules.h> #include <map> @@ -30,11 +30,12 @@ namespace Modules { typedef Common::Module *(*ModuleLoadFunc)(Common::Application*); -static const std::pair<const char*, const ModuleLoadFunc> modules[] = { +static const std::pair<const std::string, const ModuleLoadFunc> modules[] = { @STATIC_MODULE_LIST@ +std::pair<const std::string, const ModuleLoadFunc>("", 0) }; -static const std::map<const std::string, const ModuleLoadFunc> moduleMap(modules, modules+sizeof(modules)); +static const std::map<const std::string, const ModuleLoadFunc> moduleMap(modules, modules + sizeof(modules)/sizeof(modules[0])); Common::Module* loadStaticModule(Common::Application *application, const std::string &name) { std::map<const std::string, const ModuleLoadFunc>::const_iterator it = moduleMap.find(name); |