From 2276c62ff02755f536de7d153368c3b9547beb23 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 11 Mar 2025 13:05:43 +0000 Subject: Move serialization data type logic from sql.h to the core. --- include/modules/sql.h | 14 -------------- include/serialize.h | 9 ++++++--- 2 files changed, 6 insertions(+), 17 deletions(-) (limited to 'include') diff --git a/include/modules/sql.h b/include/modules/sql.h index 81af2e597..18d169d81 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -19,7 +19,6 @@ namespace SQL public: typedef std::map Map; Map data; - std::map types; ~Data() { @@ -59,19 +58,6 @@ namespace SQL delete value; this->data.clear(); } - - void SetType(const Anope::string &key, Serialize::DataType dt) override - { - this->types[key] = dt; - } - - Serialize::DataType GetType(const Anope::string &key) const override - { - auto it = this->types.find(key); - if (it != this->types.end()) - return it->second; - return Serialize::DataType::TEXT; - } }; /** A SQL exception, can be thrown at various points diff --git a/include/serialize.h b/include/serialize.h index 1459a1ebd..a4895ac0c 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -28,8 +28,11 @@ namespace Serialize UINT, }; - class Data + class CoreExport Data { + protected: + std::map types; + public: virtual ~Data() = default; @@ -54,8 +57,8 @@ namespace Serialize virtual size_t Hash() const { throw CoreException("Not supported"); } - virtual void SetType(const Anope::string &key, DataType dt) { } - virtual DataType GetType(const Anope::string &key) const { return DataType::TEXT; } + Serialize::DataType GetType(const Anope::string &key) const; + void SetType(const Anope::string &key, Serialize::DataType dt); }; extern void RegisterTypes(); -- cgit