From 4e488cb54d72fb4a1caa580f6756a6f4687beaf6 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 2 Mar 2021 05:39:12 +0000 Subject: Refactor classbase/CullResult into Cullable/Cullable::Result. --- src/base.cpp | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'src/base.cpp') diff --git a/src/base.cpp b/src/base.cpp index 5312e5789..063457b8b 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -26,34 +26,6 @@ #include "inspircd.h" #include "base.h" #include -#ifdef INSPIRCD_ENABLE_RTTI -#include -#endif - -classbase::classbase() -{ -#ifdef INSPIRCD_ENABLE_RTTI - if (ServerInstance) - ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "classbase::+%s @%p", typeid(*this).name(), (void*)this); -#endif -} - -CullResult classbase::cull() -{ -#ifdef INSPIRCD_ENABLE_RTTI - if (ServerInstance) - ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p", typeid(*this).name(), (void*)this); -#endif - return CullResult(); -} - -classbase::~classbase() -{ -#ifdef INSPIRCD_ENABLE_RTTI - if (ServerInstance) - ServerInstance->Logs.Log("CULLLIST", LOG_DEBUG, "classbase::~%s @%p", typeid(*this).name(), (void*)this); -#endif -} // This trick detects heap allocations of refcountbase objects static void* last_heap = NULL; @@ -189,11 +161,11 @@ Extensible::Extensible() { } -CullResult Extensible::cull() +Cullable::Result Extensible::Cull() { FreeAllExtItems(); culled = true; - return classbase::cull(); + return Cullable::Cull(); } void Extensible::FreeAllExtItems() -- cgit v1.3.1-10-gc9f91