From 2a0cce9d4680af924a2b53fb36731591340fffa9 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 5 Sep 2022 21:14:36 +0100 Subject: Fix more warnings discovered with -Weverything. --- include/ctables.h | 2 -- include/dynamic.h | 2 +- include/dynref.h | 2 ++ include/logging.h | 4 +--- include/modules/sql.h | 3 --- include/xline.h | 4 ---- 6 files changed, 4 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/ctables.h b/include/ctables.h index 63dc2c36c..857ae15bf 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -219,8 +219,6 @@ public: * @param index The parameter index (0 == first parameter). */ virtual void EncodeParameter(std::string& parameter, unsigned int index); - - virtual ~CommandBase() = default; }; class CoreExport Command diff --git a/include/dynamic.h b/include/dynamic.h index d4ec7a30d..0b3e73c37 100644 --- a/include/dynamic.h +++ b/include/dynamic.h @@ -64,7 +64,7 @@ public: DLLManager(const std::string& name); /** Unloads the module if one was loaded. */ - ~DLLManager(); + ~DLLManager() override; /** Attempts to create a new module instance from this shared library. * @return Either a new instance of the Module class or NULL on error. diff --git a/include/dynref.h b/include/dynref.h index d687b909c..f306e1b45 100644 --- a/include/dynref.h +++ b/include/dynref.h @@ -45,7 +45,9 @@ protected: public: ModuleRef creator; dynamic_reference_base(Module* Creator, const std::string& Name); + dynamic_reference_base(const dynamic_reference_base&) = default; ~dynamic_reference_base(); + inline const std::string& GetProvider() const { return name; } void ClearProvider(); void SetProvider(const std::string& newname); diff --git a/include/logging.h b/include/logging.h index 312df543d..325cbbc1c 100644 --- a/include/logging.h +++ b/include/logging.h @@ -64,8 +64,6 @@ class CoreExport Log::Method : public Cullable { public: - virtual ~Method() = default; - /** Determines whether this logging method accepts cached messages. */ virtual bool AcceptsCachedMessages() const { return true; } @@ -121,7 +119,7 @@ protected: Engine(Module* Creator, const std::string& Name); public: - virtual ~Engine(); + virtual ~Engine() override; /** Creates a new logger from the specified config. * @param tag The config tag to configure the logger with. diff --git a/include/modules/sql.h b/include/modules/sql.h index 1363e9996..48e1fe85d 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -180,9 +180,6 @@ protected: public: const ModuleRef creator; - /* Destroys this Query instance. */ - virtual ~Query() = default; - /** Called when an SQL error happens. * @param error The error that occurred. */ diff --git a/include/xline.h b/include/xline.h index 9e4864071..c71af1393 100644 --- a/include/xline.h +++ b/include/xline.h @@ -63,10 +63,6 @@ public: expiry = set_time + duration; } - /** Destructor - */ - virtual ~XLine() = default; - /** Change creation time of an xline. Updates expiry * to be after the creation time. */ -- cgit v1.3.1-10-gc9f91