From 9ed53d543ffab5666986e704eae1c1977734fb90 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 18 Jan 2023 14:54:04 +0000
Subject: Fix Cloak::Method and Log::Method being needlessly Cullable.

If a method needs to be cullable it can inherit from that type and
pass Cullable::Deleter as a custom deleter to the shared_ptr.
---
 include/logging.h       | 6 +++++-
 include/modules/cloak.h | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/logging.h b/include/logging.h
index 06e35c449..83957346f 100644
--- a/include/logging.h
+++ b/include/logging.h
@@ -65,9 +65,13 @@ namespace Log
 
 /** Base class for logging methods. */
 class CoreExport Log::Method
-	: public Cullable
 {
+protected:
+	Method() = default;
+
 public:
+	virtual ~Method() = default;
+
 	/** Determines whether this logging method accepts cached messages. */
 	virtual bool AcceptsCachedMessages() const { return true; }
 
diff --git a/include/modules/cloak.h b/include/modules/cloak.h
index 050f03562..7a714c947 100644
--- a/include/modules/cloak.h
+++ b/include/modules/cloak.h
@@ -73,7 +73,6 @@ public:
 
 /** Base class for cloak methods. */
 class Cloak::Method
-	: public Cullable
 {
 private:
 	/** The name of the engine that created this method. */
@@ -86,6 +85,8 @@ protected:
 	}
 
 public:
+	virtual ~Method() = default;
+
 	/** Generates a cloak for the specified user.
 	 * @param user The user to generate a cloak for.
 	 */
-- 
cgit v1.3.1-10-gc9f91