diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/access.cpp | 2 | ||||
-rw-r--r-- | src/bots.cpp | 2 | ||||
-rw-r--r-- | src/channels.cpp | 22 | ||||
-rw-r--r-- | src/config.cpp | 18 | ||||
-rw-r--r-- | src/memoserv.cpp | 2 | ||||
-rw-r--r-- | src/modes.cpp | 22 | ||||
-rw-r--r-- | src/nickalias.cpp | 2 | ||||
-rw-r--r-- | src/nickcore.cpp | 2 | ||||
-rw-r--r-- | src/operserv.cpp | 2 | ||||
-rw-r--r-- | src/regchannel.cpp | 10 |
10 files changed, 42 insertions, 42 deletions
diff --git a/src/access.cpp b/src/access.cpp index 1100d8e7c..189e275a3 100644 --- a/src/access.cpp +++ b/src/access.cpp @@ -116,7 +116,7 @@ Serializable* ChanAccess::unserialize(Serializable *obj, Serialize::Data &data) ChanAccess *access; if (obj) - access = debug_cast<ChanAccess *>(obj); + access = anope_dynamic_static_cast<ChanAccess *>(obj); else access = const_cast<ChanAccess *>(aprovider->Create()); access->provider = aprovider; diff --git a/src/bots.cpp b/src/bots.cpp index e9d279c3e..a4db8b5a3 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -97,7 +97,7 @@ Serializable* BotInfo::unserialize(Serializable *obj, Serialize::Data &data) { BotInfo *bi; if (obj) - bi = debug_cast<BotInfo *>(obj); + bi = anope_dynamic_static_cast<BotInfo *>(obj); else if (!(bi = findbot(data["nick"].astr()))) bi = new BotInfo(data["nick"].astr(), data["user"].astr(), data["host"].astr(), data["realname"].astr()); data["created"] >> bi->created; diff --git a/src/channels.cpp b/src/channels.cpp index 3cdfd8e7c..385376ea2 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -299,7 +299,7 @@ bool Channel::HasUserStatus(const User *u, ChannelModeStatus *cms) const */ bool Channel::HasUserStatus(const User *u, ChannelModeName Name) const { - return HasUserStatus(u, debug_cast<ChannelModeStatus *>(ModeManager::FindChannelModeByName(Name))); + return HasUserStatus(u, anope_dynamic_static_cast<ChannelModeStatus *>(ModeManager::FindChannelModeByName(Name))); } /** @@ -387,7 +387,7 @@ void Channel::SetModeInternal(User *setter, ChannelMode *cm, const Anope::string if (cm->Type == MODE_LIST) { - ChannelModeList *cml = debug_cast<ChannelModeList *>(cm); + ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm); cml->OnAdd(this, param); } @@ -474,7 +474,7 @@ void Channel::RemoveModeInternal(User *setter, ChannelMode *cm, const Anope::str if (cm->Type == MODE_LIST) { - ChannelModeList *cml = debug_cast<ChannelModeList *>(cm); + ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm); cml->OnDel(this, param); } @@ -515,7 +515,7 @@ void Channel::SetMode(BotInfo *bi, ChannelMode *cm, const Anope::string ¶m, return; else if (cm->Type == MODE_PARAM) { - ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm); + ChannelModeParam *cmp = anope_dynamic_static_cast<ChannelModeParam *>(cm); if (!cmp->IsValid(param)) return; @@ -526,12 +526,12 @@ void Channel::SetMode(BotInfo *bi, ChannelMode *cm, const Anope::string ¶m, else if (cm->Type == MODE_STATUS) { User *u = finduser(param); - if (!u || HasUserStatus(u, debug_cast<ChannelModeStatus *>(cm))) + if (!u || HasUserStatus(u, anope_dynamic_static_cast<ChannelModeStatus *>(cm))) return; } else if (cm->Type == MODE_LIST) { - ChannelModeList *cml = debug_cast<ChannelModeList *>(cm); + ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm); if (this->HasMode(cm->Name, param) || !cml->IsValid(param)) return; } @@ -569,7 +569,7 @@ void Channel::RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string ¶ else if (cm->Type == MODE_STATUS) { User *u = finduser(param); - if (!u || !HasUserStatus(u, debug_cast<ChannelModeStatus *>(cm))) + if (!u || !HasUserStatus(u, anope_dynamic_static_cast<ChannelModeStatus *>(cm))) return; } else if (cm->Type == MODE_LIST) @@ -583,7 +583,7 @@ void Channel::RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string ¶ if (cm->Type == MODE_PARAM) { realparam.clear(); - ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm); + ChannelModeParam *cmp = anope_dynamic_static_cast<ChannelModeParam *>(cm); if (!cmp->MinusNoArg) this->GetParam(cmp->Name, realparam); } @@ -734,7 +734,7 @@ void Channel::SetModesInternal(User *setter, const Anope::string &mode, bool Enf } else if (cm->Type == MODE_PARAM) { - ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm); + ChannelModeParam *cmp = anope_dynamic_static_cast<ChannelModeParam *>(cm); if (!add && cmp->MinusNoArg) { @@ -857,7 +857,7 @@ Anope::string Channel::GetModes(bool complete, bool plus) if (complete && !it->second.empty()) { - ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm); + ChannelModeParam *cmp = anope_dynamic_static_cast<ChannelModeParam *>(cm); if (plus || !cmp->MinusNoArg) params += " " + it->second; @@ -1368,7 +1368,7 @@ bool Entry::Matches(const User *u, bool full) const ChannelMode *cm = ModeManager::FindChannelModeByName(this->modename); if (cm != NULL && cm->Type == MODE_LIST) { - ChannelModeList *cml = debug_cast<ChannelModeList *>(cm); + ChannelModeList *cml = anope_dynamic_static_cast<ChannelModeList *>(cm); if (cml->Matches(u, this)) ret = true; } diff --git a/src/config.cpp b/src/config.cpp index 66d8f6a8c..24b9e13b6 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1501,63 +1501,63 @@ void ServerConfig::Read() { case DT_NOSPACES: { - ValueContainerString *vcs = debug_cast<ValueContainerString *>(configitems.Values[Index].val); + ValueContainerString *vcs = anope_dynamic_static_cast<ValueContainerString *>(configitems.Values[Index].val); ValidateNoSpaces(vi.GetValue(), configitems.Values[Index].tag, configitems.Values[Index].value); vcs->Set(vi.GetValue()); break; } case DT_HOSTNAME: { - ValueContainerString *vcs = debug_cast<ValueContainerString *>(configitems.Values[Index].val); + ValueContainerString *vcs = anope_dynamic_static_cast<ValueContainerString *>(configitems.Values[Index].val); ValidateHostname(vi.GetValue(), configitems.Values[Index].tag, configitems.Values[Index].value); vcs->Set(vi.GetValue()); break; } case DT_IPADDRESS: { - ValueContainerString *vcs = debug_cast<ValueContainerString *>(configitems.Values[Index].val); + ValueContainerString *vcs = anope_dynamic_static_cast<ValueContainerString *>(configitems.Values[Index].val); ValidateIP(vi.GetValue(), configitems.Values[Index].tag, configitems.Values[Index].value, allow_wild); vcs->Set(vi.GetValue()); break; } case DT_STRING: { - ValueContainerString *vcs = debug_cast<ValueContainerString *>(configitems.Values[Index].val); + ValueContainerString *vcs = anope_dynamic_static_cast<ValueContainerString *>(configitems.Values[Index].val); vcs->Set(vi.GetValue()); break; } case DT_INTEGER: { int val = vi.GetInteger(); - ValueContainerInt *vci = debug_cast<ValueContainerInt *>(configitems.Values[Index].val); + ValueContainerInt *vci = anope_dynamic_static_cast<ValueContainerInt *>(configitems.Values[Index].val); vci->Set(&val, sizeof(int)); break; } case DT_UINTEGER: { unsigned val = vi.GetInteger(); - ValueContainerUInt *vci = debug_cast<ValueContainerUInt *>(configitems.Values[Index].val); + ValueContainerUInt *vci = anope_dynamic_static_cast<ValueContainerUInt *>(configitems.Values[Index].val); vci->Set(&val, sizeof(unsigned)); break; } case DT_LUINTEGER: { unsigned long val = vi.GetInteger(); - ValueContainerLUInt *vci = debug_cast<ValueContainerLUInt *>(configitems.Values[Index].val); + ValueContainerLUInt *vci = anope_dynamic_static_cast<ValueContainerLUInt *>(configitems.Values[Index].val); vci->Set(&val, sizeof(unsigned long)); break; } case DT_TIME: { time_t time = dotime(vi.GetValue()); - ValueContainerTime *vci = debug_cast<ValueContainerTime *>(configitems.Values[Index].val); + ValueContainerTime *vci = anope_dynamic_static_cast<ValueContainerTime *>(configitems.Values[Index].val); vci->Set(&time, sizeof(time_t)); break; } case DT_BOOLEAN: { bool val = vi.GetBool(); - ValueContainerBool *vcb = debug_cast<ValueContainerBool *>(configitems.Values[Index].val); + ValueContainerBool *vcb = anope_dynamic_static_cast<ValueContainerBool *>(configitems.Values[Index].val); vcb->Set(&val, sizeof(bool)); break; } diff --git a/src/memoserv.cpp b/src/memoserv.cpp index 92c027702..c2e1de939 100644 --- a/src/memoserv.cpp +++ b/src/memoserv.cpp @@ -50,7 +50,7 @@ Serializable* Memo::unserialize(Serializable *obj, Serialize::Data &data) Memo *m; if (obj) - m = debug_cast<Memo *>(obj); + m = anope_dynamic_static_cast<Memo *>(obj); else m = new Memo(); data["owner"] >> m->owner; diff --git a/src/modes.cpp b/src/modes.cpp index dd5897087..b9960f38f 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -112,7 +112,7 @@ Anope::string ChannelStatus::BuildModePrefixList() const if (this->HasFlag(cm->Name)) { - ChannelModeStatus *cms = debug_cast<ChannelModeStatus *>(cm); + ChannelModeStatus *cms = anope_dynamic_static_cast<ChannelModeStatus *>(cm); ret += cms->Symbol; } } @@ -302,13 +302,13 @@ void StackerInfo::AddMode(Mode *mode, bool Set, const Anope::string &Param) if (Type == ST_CHANNEL) { - cm = debug_cast<ChannelMode *>(mode); + cm = anope_dynamic_static_cast<ChannelMode *>(mode); if (cm->Type == MODE_PARAM) IsParam = true; } else if (Type == ST_USER) { - um = debug_cast<UserMode *>(mode); + um = anope_dynamic_static_cast<UserMode *>(mode); if (um->Type == MODE_PARAM) IsParam = true; } @@ -411,12 +411,12 @@ std::list<Anope::string> ModeManager::BuildModeStrings(StackerInfo *info) if (info->Type == ST_CHANNEL) { - cm = debug_cast<ChannelMode *>(it->first); + cm = anope_dynamic_static_cast<ChannelMode *>(it->first); buf += cm->ModeChar; } else if (info->Type == ST_USER) { - um = debug_cast<UserMode *>(it->first); + um = anope_dynamic_static_cast<UserMode *>(it->first); buf += um->ModeChar; } @@ -440,12 +440,12 @@ std::list<Anope::string> ModeManager::BuildModeStrings(StackerInfo *info) if (info->Type == ST_CHANNEL) { - cm = debug_cast<ChannelMode *>(it->first); + cm = anope_dynamic_static_cast<ChannelMode *>(it->first); buf += cm->ModeChar; } else if (info->Type == ST_USER) { - um = debug_cast<UserMode *>(it->first); + um = anope_dynamic_static_cast<UserMode *>(it->first); buf += um->ModeChar; } @@ -478,7 +478,7 @@ void ModeManager::StackerAddInternal(const BotInfo *bi, Base *Object, Mode *mode if (bi) s->bi = bi; else if (Type == ST_CHANNEL) - s->bi = debug_cast<Channel *>(Object)->ci->WhoSends(); + s->bi = anope_dynamic_reinterpret_cast<Channel *>(Object)->ci->WhoSends(); else if (Type == ST_USER) s->bi = NULL; @@ -638,7 +638,7 @@ char ModeManager::GetStatusChar(char Value) ChannelMode *cm = ModeManager::ChannelModes[i]; if (cm->Type == MODE_STATUS) { - ChannelModeStatus *cms = debug_cast<ChannelModeStatus *>(cm); + ChannelModeStatus *cms = anope_dynamic_static_cast<ChannelModeStatus *>(cm); if (Value == cms->Symbol) return cms->ModeChar; @@ -685,9 +685,9 @@ void ModeManager::ProcessModes() Channel *c = NULL; if (s->Type == ST_USER) - u = debug_cast<User *>(it->first); + u = anope_dynamic_reinterpret_cast<User *>(it->first); else if (s->Type == ST_CHANNEL) - c = debug_cast<Channel *>(it->first); + c = anope_dynamic_reinterpret_cast<Channel *>(it->first); else throw CoreException("ModeManager::ProcessModes got invalid Stacker Info type"); diff --git a/src/nickalias.cpp b/src/nickalias.cpp index 18e581714..bdd010e23 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -281,7 +281,7 @@ Serializable* NickAlias::unserialize(Serializable *obj, Serialize::Data &data) NickAlias *na; if (obj) - na = debug_cast<NickAlias *>(obj); + na = anope_dynamic_static_cast<NickAlias *>(obj); else na = new NickAlias(data["nick"].astr(), core); diff --git a/src/nickcore.cpp b/src/nickcore.cpp index e68e7444d..de64a7e9e 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -91,7 +91,7 @@ Serializable* NickCore::unserialize(Serializable *obj, Serialize::Data &data) NickCore *nc; if (obj) - nc = debug_cast<NickCore *>(obj); + nc = anope_dynamic_static_cast<NickCore *>(obj); else nc = new NickCore(data["display"].astr()); diff --git a/src/operserv.cpp b/src/operserv.cpp index 59a91aa09..9d006a7c1 100644 --- a/src/operserv.cpp +++ b/src/operserv.cpp @@ -168,7 +168,7 @@ Serializable* XLine::unserialize(Serializable *obj, Serialize::Data &data) XLine *xl; if (obj) { - xl = debug_cast<XLine *>(obj); + xl = anope_dynamic_static_cast<XLine *>(obj); data["mask"] >> xl->Mask; data["by"] >> xl->By; data["reason"] >> xl->Reason; diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 2ee66805a..b113dfb2e 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -51,7 +51,7 @@ Serializable* BadWord::unserialize(Serializable *obj, Serialize::Data &data) BadWord *bw; if (obj) { - bw = debug_cast<BadWord *>(obj); + bw = anope_dynamic_static_cast<BadWord *>(obj); data["word"] >> bw->word; bw->type = static_cast<BadWordType>(n); } @@ -98,7 +98,7 @@ Serializable* AutoKick::unserialize(Serializable *obj, Serialize::Data &data) NickCore *nc = findcore(data["nc"].astr()); if (obj) { - ak = debug_cast<AutoKick *>(obj); + ak = anope_dynamic_static_cast<AutoKick *>(obj); data["creator"] >> ak->creator; data["reason"] >> ak->reason; ak->nc = findcore(data["nc"].astr()); @@ -167,7 +167,7 @@ Serializable* ModeLock::unserialize(Serializable *obj, Serialize::Data &data) ModeLock *ml; if (obj) { - ml = debug_cast<ModeLock *>(obj); + ml = anope_dynamic_static_cast<ModeLock *>(obj); data["set"] >> ml->set; ml->name = name; @@ -224,7 +224,7 @@ Serializable* LogSetting::unserialize(Serializable *obj, Serialize::Data &data) LogSetting *ls; if (obj) - ls = debug_cast<LogSetting *>(obj); + ls = anope_dynamic_static_cast<LogSetting *>(obj); else { ls = new LogSetting(); @@ -433,7 +433,7 @@ Serializable* ChannelInfo::unserialize(Serializable *obj, Serialize::Data &data) { ChannelInfo *ci; if (obj) - ci = debug_cast<ChannelInfo *>(obj); + ci = anope_dynamic_static_cast<ChannelInfo *>(obj); else ci = new ChannelInfo(data["name"].astr()); |