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 --- modules/extra/mysql/db_mysql_write.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/extra') diff --git a/modules/extra/mysql/db_mysql_write.cpp b/modules/extra/mysql/db_mysql_write.cpp index 2d44450c1..5d2ef2a78 100644 --- a/modules/extra/mysql/db_mysql_write.cpp +++ b/modules/extra/mysql/db_mysql_write.cpp @@ -66,7 +66,7 @@ static std::string MakeMLock(ChannelInfo *ci, bool status) { if ((*it)->Class == MC_CHANNEL) { - ChannelMode *cm = dynamic_cast(*it); + ChannelMode *cm = debug_cast(*it); if (ci->HasMLock(cm->Name, status)) ret += " " + cm->NameAsString; @@ -97,7 +97,7 @@ static std::string GetMLockParams(ChannelInfo *ci) { if ((*it)->Class == MC_CHANNEL) { - ChannelMode *cm = dynamic_cast(*it); + ChannelMode *cm = debug_cast(*it); std::string param; if (ci->GetParam(cm->Name, param)) -- 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 --- modules/extra/cs_set_misc.cpp | 3 ++- modules/extra/ns_set_misc.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/extra') diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp index 7cffe6866..d287a24c1 100644 --- a/modules/extra/cs_set_misc.cpp +++ b/modules/extra/cs_set_misc.cpp @@ -23,7 +23,8 @@ class CommandCSSetMisc : public Command CommandReturn Execute(User *u, const std::vector ¶ms) { ChannelInfo *ci = cs_findchan(params[0]); - assert(ci); + if (!ci) + throw CoreException("NULL ci in CommandCSSetMisc"); ci->Shrink("chanserv:" + this->name); if (params.size() > 1) diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp index 9e0f23eb0..8ab54fd05 100644 --- a/modules/extra/ns_set_misc.cpp +++ b/modules/extra/ns_set_misc.cpp @@ -22,7 +22,8 @@ class CommandNSSetMisc : public Command CommandReturn RealExecute(User *u, const std::vector ¶ms) { NickCore *nc = findcore(params[0]); - assert(nc); + if (!nc) + throw CoreException("NULL nc in CommandNSSetMisc"); nc->Shrink("nickserv:" + this->name); if (params.size() > 1) -- cgit