diff options
| -rw-r--r-- | include/serialize.h | 5 | ||||
| -rw-r--r-- | modules/database/db_flatfile.cpp | 4 | ||||
| -rw-r--r-- | modules/database/db_json.cpp | 2 | ||||
| -rw-r--r-- | modules/database/db_redis.cpp | 2 | ||||
| -rw-r--r-- | modules/database/db_sql.cpp | 2 | ||||
| -rw-r--r-- | modules/database/db_sql_live.cpp | 6 |
6 files changed, 11 insertions, 10 deletions
diff --git a/include/serialize.h b/include/serialize.h index 440c8030c..e6ca7877a 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -110,10 +110,11 @@ protected: Serializable &operator=(const Serializable &); public: + using Id = uint64_t; virtual ~Serializable(); /* Unique ID (per type, not globally) for this object */ - uint64_t id = 0; + Id id = 0; /* Only used by redis, to ignore updates */ unsigned short redis_ignore = 0; @@ -175,7 +176,7 @@ protected: public: /* Map of Serializable objects of this type keyed by their object id. */ - std::map<uint64_t, Serializable *> objects; + std::map<Serializable::Id, Serializable *> objects; /** Destroys a serializable type. */ ~Type(); diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 2b2ede625..a68d80633 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -41,7 +41,7 @@ class LoadData final { public: std::fstream *fs; - uint64_t id = 0; + Serializable::Id id = 0; std::map<Anope::string, Anope::string> data; std::stringstream ss; bool read = false; @@ -59,7 +59,7 @@ public: { if (token.find("ID ") == 0) { - this->id = Anope::Convert<uint64_t>(token.substr(3), 0); + this->id = Anope::Convert<Serializable::Id>(token.substr(3), 0); continue; } else if (token.find("DATA ") != 0) diff --git a/modules/database/db_json.cpp b/modules/database/db_json.cpp index a0b966e62..a3587a2dc 100644 --- a/modules/database/db_json.cpp +++ b/modules/database/db_json.cpp @@ -41,7 +41,7 @@ class Data final { public: // If non-zero then the id of the database entry. - uint64_t id = 0; + Serializable::Id id = 0; // Data in this database entry. Anope::map<std::stringstream> data; diff --git a/modules/database/db_redis.cpp b/modules/database/db_redis.cpp index c3a23a23c..45d3385ad 100644 --- a/modules/database/db_redis.cpp +++ b/modules/database/db_redis.cpp @@ -492,7 +492,7 @@ void SubscriptionListener::OnResult(const Reply &r) if (s_type == NULL) return; - auto oid = Anope::TryConvert<uint64_t>(id); + auto oid = Anope::TryConvert<Serializable::Id>(id); if (!oid.has_value()) return; diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index b2d430fa2..18572b197 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -255,7 +255,7 @@ public: Serializable *obj = sb->Unserialize(NULL, data); if (obj) { - auto oid = Anope::TryConvert<unsigned int>(res.Get(j, "id")); + auto oid = Anope::TryConvert<Serializable::Id>(res.Get(j, "id")); if (oid.has_value()) obj->id = oid.value(); else diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp index 9389e5a59..c20a11a9f 100644 --- a/modules/database/db_sql_live.cpp +++ b/modules/database/db_sql_live.cpp @@ -190,7 +190,7 @@ public: - auto oid = Anope::TryConvert<unsigned int>(res.Get(i, "id")); + auto oid = Anope::TryConvert<Serializable::Id>(res.Get(i, "id")); if (!oid.has_value()) { Log(LOG_DEBUG) << "Unable to convert id from " << obj->GetName(); @@ -201,7 +201,7 @@ public: if (res.Get(i, "timestamp").empty()) { clear_null = true; - std::map<uint64_t, Serializable *>::iterator it = obj->objects.find(id); + auto it = obj->objects.find(id); if (it != obj->objects.end()) delete it->second; // This also removes this object from the map } @@ -213,7 +213,7 @@ public: data[key] << value; Serializable *s = NULL; - std::map<uint64_t, Serializable *>::iterator it = obj->objects.find(id); + auto it = obj->objects.find(id); if (it != obj->objects.end()) s = it->second; |