pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

Add a typedef for the serializable id.

Browse Source
This commit is contained in:
Sadie Powell
2025-03-26 10:22:42 +00:00
parent 49d86527ef
commit dc09408f1a
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/serialize.h
+3 -2
View File
@@ -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();
modules/database/db_flatfile.cpp
+2 -2
View File
@@ -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)
modules/database/db_json.cpp
+1 -1
View File
@@ -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;
modules/database/db_redis.cpp
+1 -1
View File
@@ -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;
modules/database/db_sql.cpp
+1 -1
View File
@@ -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
modules/database/db_sql_live.cpp
+3 -3
View File
@@ -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;