From 7d84e4900fa8f4ef96e8cf4bb67b76be7902e840 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 4 Apr 2021 23:42:15 +0100 Subject: Fix a ton of pedantic compiler warnings. --- src/cull.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/cull.cpp') diff --git a/src/cull.cpp b/src/cull.cpp index ed4b06c09..9a6665a29 100644 --- a/src/cull.cpp +++ b/src/cull.cpp @@ -35,7 +35,7 @@ Cullable::Cullable() if (ServerInstance) { ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Cullable::+%s @%p", - typeid(*this).name(), (void*)this); + typeid(*this).name(), static_cast(this)); } #endif } @@ -46,7 +46,7 @@ Cullable::~Cullable() if (ServerInstance) { ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Cullable::~%s @%p", - typeid(*this).name(), (void*)this); + typeid(*this).name(), static_cast(this)); } #endif } @@ -57,7 +57,7 @@ Cullable::Result Cullable::Cull() if (ServerInstance) { ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Cullable::-%s @%p", - typeid(*this).name(), (void*)this); + typeid(*this).name(), static_cast(this)); } #endif return Result(); @@ -88,9 +88,9 @@ void CullList::Apply() { #ifdef INSPIRCD_ENABLE_RTTI ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Deleting %s @%p", typeid(*c).name(), - (void*)c); + static_cast(c)); #else - ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Deleting @%p", (void*)c); + ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "Deleting @%p", static_cast(c)); #endif c->Cull(); queue.push_back(c); @@ -98,7 +98,7 @@ void CullList::Apply() else { ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "WARNING: Object @%p culled twice!", - (void*)c); + static_cast(c)); } } list.clear(); -- cgit v1.3.1-10-gc9f91