From 2f512281029fbf4f7ef9832e05804831ad2d9ba2 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 30 Nov 2016 13:13:41 -0500 Subject: Fix some field shadowing warnings --- modules/database/sql.cpp | 4 ++-- modules/sqlite.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/database/sql.cpp b/modules/database/sql.cpp index e1b766b57..7ca4eb6d7 100644 --- a/modules/database/sql.cpp +++ b/modules/database/sql.cpp @@ -173,7 +173,7 @@ class DBSQL : public Module, public Pipe { for (Serialize::FieldBase *field : type->GetFields()) { - if (field->object) + if (field->is_object) { Anope::string table = prefix + type->GetName(); @@ -344,7 +344,7 @@ class DBSQL : public Module, public Pipe EventReturn OnSerializeHasField(Serialize::Object *object, Serialize::FieldBase *field) override { - if (field->object) + if (field->is_object) { Anope::string type; Serialize::ID id; diff --git a/modules/sqlite.cpp b/modules/sqlite.cpp index e4893b1ce..5fbbb855e 100644 --- a/modules/sqlite.cpp +++ b/modules/sqlite.cpp @@ -301,7 +301,7 @@ std::vector SQLiteService::CreateTable(const Anope::string &prefix, Seria query += "`" + field->serialize_name + "`"; fields.insert(field->serialize_name); - if (field->object) + if (field->is_object) { Anope::string refname = field->GetTypeName() == Serialize::Object::NAME ? "objects" : field->GetTypeName(); query += " REFERENCES " + prefix + refname + "(id) ON DELETE "; @@ -341,7 +341,7 @@ std::vector SQLiteService::AlterTable(const Anope::string &prefix, Serial { Anope::string buf = "ALTER TABLE `" + prefix + table + "` ADD `" + field->serialize_name + "`"; - if (field->object) + if (field->is_object) { buf += " REFERENCES " + prefix + "objects(id) ON DELETE "; -- cgit