diff options
| author | Adam <Adam@anope.org> | 2012-12-12 00:48:46 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-12-12 00:49:16 -0500 |
| commit | dfff54425b5995f0f4267abbaab7cb420cf18642 (patch) | |
| tree | d7b11f3c2e500f2e626a86ec862c16c60b8aa13f /include | |
| parent | 0edd26467e6be11fe4ce3785f05bd065d810798a (diff) | |
Fixed webpanel fail on nondebug builds
Diffstat (limited to 'include')
| -rw-r--r-- | include/anope.h | 14 | ||||
| -rw-r--r-- | include/extensible.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/include/anope.h b/include/anope.h index 15944e165..30ca48e69 100644 --- a/include/anope.h +++ b/include/anope.h @@ -713,7 +713,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto } /** Casts to be used instead of dynamic_cast, this uses dynamic_cast - * for debug builds and static_cast/reinterpret_cast on releass builds + * for debug builds and static_cast on releass builds * to speed up the program because dynamic_cast relies on RTTI. */ #ifdef DEBUG_BUILD @@ -731,18 +731,6 @@ template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr) #endif } -template<typename T, typename O> inline T anope_dynamic_reinterpret_cast(O ptr) -{ -#ifdef DEBUG_BUILD - T ret = dynamic_cast<T>(ptr); - if (ptr != NULL && ret == NULL) - throw CoreException(Anope::string("anope_dynamic_reinterpret_cast<") + typeid(T).name() + ">(" + typeid(O).name() + ") fail"); - return ret; -#else - return reinterpret_cast<T>(ptr); -#endif -} - /*************************************************************************/ /** Class with the ability to keep flags on items, they should extend from this diff --git a/include/extensible.h b/include/extensible.h index 493dc20cf..bd7c8c76d 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -107,7 +107,7 @@ class CoreExport Extensible { extensible_map::const_iterator it = this->extension_items.find(key); if (it != this->extension_items.end()) - return anope_dynamic_reinterpret_cast<T>(it->second); + return anope_dynamic_static_cast<T>(it->second); return NULL; } |
