From 4b870cc5f9671201dfad6fa836847cdd40aef519 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 27 Jul 2010 21:31:13 -0400 Subject: Added debug_cast which uses dynamic_cast on debug builds, and static_cast on release builds --- include/extensible.h | 6 +++--- include/services.h | 17 +++++++++++++++++ include/sysconf.h.cmake | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/extensible.h b/include/extensible.h index 523a25b6d..5ab32c6eb 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -153,7 +153,7 @@ class CoreExport Extensible if (it != this->Extension_Items.end()) { - p = dynamic_cast *>(it->second)->GetItem(); + p = debug_cast *>(it->second)->GetItem(); return true; } @@ -172,7 +172,7 @@ class CoreExport Extensible if (it != this->Extension_Items.end()) { - p = dynamic_cast *>(it->second)->GetItem(); + p = debug_cast *>(it->second)->GetItem(); return true; } @@ -192,7 +192,7 @@ class CoreExport Extensible if (it != this->Extension_Items.end()) { - p = dynamic_cast *>(it->second)->GetItem(); + p = debug_cast *>(it->second)->GetItem(); return true; } diff --git a/include/services.h b/include/services.h index 16f365a09..8e1adcf01 100644 --- a/include/services.h +++ b/include/services.h @@ -41,6 +41,7 @@ #include #include #include +#include #ifndef _WIN32 # include @@ -268,6 +269,22 @@ class DatabaseException : public CoreException virtual ~DatabaseException() throw() { } }; +/** Debug cast to be used instead of dynamic_cast, this uses dynamic_cast + * for debug builds and static_cast on releass builds to speed up the program + * because dynamic_cast relies on RTTI. + */ +template inline T debug_cast(O ptr) +{ +#ifdef DEBUG_BUILD + T ret = dynamic_cast(ptr); + if (ret == NULL) + throw CoreException(Anope::string("debug_cast<") + typeid(T).name() + ">(" + typeid(O).name() + ") fail"); + return ret; +#else + return static_cast(ptr); +#endif +} + /*************************************************************************/ /** Class with the ability to keep flags on items, they should extend from this diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index 5884a3284..0184c5359 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -1,6 +1,8 @@ #ifndef _SYSCONF_H_ #define _SYSCONF_H_ +#cmakedefine DEBUG_BUILD + #cmakedefine DEFUMASK @DEFUMASK@ #cmakedefine HAVE_SYS_TYPES_H 1 #cmakedefine HAVE_STDINT_H 1 -- cgit From a2573a2c3067343ebf46292691671ba4bad855a8 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 27 Jul 2010 22:12:20 -0400 Subject: Removed some assertions, replaced with throwing CoreExceptions --- include/services.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/services.h b/include/services.h index 8e1adcf01..fdbaccbfc 100644 --- a/include/services.h +++ b/include/services.h @@ -39,7 +39,6 @@ #include /* for umask() on some systems */ #include -#include #include #include -- cgit