Disable typeid() calls unless INSPIRCD_ENABLE_RTTI is defined

diff --git a/src/base.cpp b/src/base.cpp
index c131f4dae25ae440eef1414524c266ea1f4e2c25..682899132fb48f786f1b0f02aa5de18e2bfccfc2 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();
 }
 

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 5cbe3aef3575bd3d27e23098b8a175a06056dc5a..73f2def51c009822b517e1b5baef2fb81f48b98a 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -21,7 +21,9 @@
 
 
 #include "inspircd.h"
+#ifdef INSPIRCD_ENABLE_RTTI
 #include <typeinfo>
+#endif
 
 void CullList::Apply()
 {
@@ -46,8 +48,12 @@ void CullList::Apply()
                classbase* c = list[i];
                if (gone.insert(c).second)
                {
+#ifdef INSPIRCD_ENABLE_RTTI
                        ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting %s @%p", typeid(*c).name(),
                                (void*)c);
+#else
+                       ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting @%p", (void*)c);
+#endif
                        c->cull();
                        queue.push_back(c);
                }