diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-07-28 00:28:59 -0400 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-07-28 00:28:59 -0400 |
| commit | aa9610a56ff18edd0703a3f391c90e1f8a761476 (patch) | |
| tree | 5fceef5b811ffcb28bcea093b59604b94a2a89c1 /include | |
| parent | 4700c9626861b193798b3cf3d53fb89a913c5819 (diff) | |
| parent | a2573a2c3067343ebf46292691671ba4bad855a8 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/extensible.h | 6 | ||||
| -rw-r--r-- | include/services.h | 18 | ||||
| -rw-r--r-- | include/sysconf.h.cmake | 2 |
3 files changed, 22 insertions, 4 deletions
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<ExtensibleItemRegular<T> *>(it->second)->GetItem(); + p = debug_cast<ExtensibleItemRegular<T> *>(it->second)->GetItem(); return true; } @@ -172,7 +172,7 @@ class CoreExport Extensible if (it != this->Extension_Items.end()) { - p = dynamic_cast<ExtensibleItemPointer<T> *>(it->second)->GetItem(); + p = debug_cast<ExtensibleItemPointer<T> *>(it->second)->GetItem(); return true; } @@ -192,7 +192,7 @@ class CoreExport Extensible if (it != this->Extension_Items.end()) { - p = dynamic_cast<ExtensibleItemPointerArray<T> *>(it->second)->GetItem(); + p = debug_cast<ExtensibleItemPointerArray<T> *>(it->second)->GetItem(); return true; } diff --git a/include/services.h b/include/services.h index 16f365a09..fdbaccbfc 100644 --- a/include/services.h +++ b/include/services.h @@ -39,8 +39,8 @@ #include <sys/stat.h> /* for umask() on some systems */ #include <sys/types.h> -#include <assert.h> #include <fcntl.h> +#include <typeinfo> #ifndef _WIN32 # include <unistd.h> @@ -268,6 +268,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<typename T, typename O> inline T debug_cast(O ptr) +{ +#ifdef DEBUG_BUILD + T ret = dynamic_cast<T>(ptr); + if (ret == NULL) + throw CoreException(Anope::string("debug_cast<") + typeid(T).name() + ">(" + typeid(O).name() + ") fail"); + return ret; +#else + return static_cast<T>(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 |