Add typedef ExtensionManager::ExtMap

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

diff --git a/src/base.cpp b/src/base.cpp
index 0441217d1c474a44ad3a11129960e871aa1152b2..c268c7493e5526a4a874af3ca630b277a9a5165b 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -23,7 +23,9 @@
 #include "inspircd.h"
 #include "base.h"
 #include <time.h>
+#ifdef INSPIRCD_ENABLE_RTTI
 #include <typeinfo>
+#endif
 
 classbase::classbase()
 {
@@ -34,8 +36,12 @@ classbase::classbase()
 CullResult classbase::cull()
 {
        if (ServerInstance)
+#ifdef INSPIRCD_ENABLE_RTTI
                ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p",
                        typeid(*this).name(), (void*)this);
+#else
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::- @%p", (void*)this);
+#endif
        return CullResult();
 }
 
@@ -141,10 +147,10 @@ bool ExtensionManager::Register(ExtensionItem* item)
 
 void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list)
 {
-       std::map<std::string, reference<ExtensionItem> >::iterator i = types.begin();
+       ExtMap::iterator i = types.begin();
        while (i != types.end())
        {
-               std::map<std::string, reference<ExtensionItem> >::iterator me = i++;
+               ExtMap::iterator me = i++;
                ExtensionItem* item = me->second;
                if (item->creator == module)
                {
@@ -156,7 +162,7 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<Ext
 
 ExtensionItem* ExtensionManager::GetItem(const std::string& name)
 {
-       std::map<std::string, reference<ExtensionItem> >::iterator i = types.find(name);
+       ExtMap::iterator i = types.find(name);
        if (i == types.end())
                return NULL;
        return i->second;