From eb81f22a5b1df18c9844893c55f57762148f2bd0 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 3 Jan 2022 19:17:02 +0000 Subject: Modernize CXXFLAGS on Unix and enable -Werror on CI. Also clear up warnings that this exposed. --- modules/extra/m_mysql.cpp | 2 +- modules/extra/m_sqlite.cpp | 10 +++++----- modules/extra/stats/m_chanstats.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index 3b4b0ea3f..96f346b53 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -151,7 +151,7 @@ class MySQLService : public Provider Anope::string BuildQuery(const Query &q); - Anope::string FromUnixtime(time_t); + Anope::string FromUnixtime(time_t) override; }; /** The SQL thread used to execute queries diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp index 1a2bed1f1..ad74c435b 100644 --- a/modules/extra/m_sqlite.cpp +++ b/modules/extra/m_sqlite.cpp @@ -55,17 +55,17 @@ class SQLiteService : public Provider void Run(Interface *i, const Query &query) override; - Result RunQuery(const Query &query); + Result RunQuery(const Query &query) override; std::vector CreateTable(const Anope::string &table, const Data &data) override; - Query BuildInsert(const Anope::string &table, unsigned int id, Data &data); + Query BuildInsert(const Anope::string &table, unsigned int id, Data &data) override; - Query GetTables(const Anope::string &prefix); + Query GetTables(const Anope::string &prefix) override; Anope::string BuildQuery(const Query &q); - Anope::string FromUnixtime(time_t); + Anope::string FromUnixtime(time_t) override; }; class ModuleSQLite : public Module @@ -200,7 +200,7 @@ Result SQLiteService::RunQuery(const Query &query) if (err != SQLITE_DONE) return SQLiteResult(query, real_query, sqlite3_errmsg(this->sql)); - return result; + return std::move(result); } std::vector SQLiteService::CreateTable(const Anope::string &table, const Data &data) diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp index 772ac4ff3..92f361f64 100644 --- a/modules/extra/stats/m_chanstats.cpp +++ b/modules/extra/stats/m_chanstats.cpp @@ -639,13 +639,13 @@ class MChanstats : public Module this->RunQuery(query); } - void OnChanRegistered(ChannelInfo *ci) + void OnChanRegistered(ChannelInfo *ci) override { if (CSDefChanstats) ci->Extend("CS_STATS"); } - void OnNickRegister(User *user, NickAlias *na, const Anope::string &) + void OnNickRegister(User *user, NickAlias *na, const Anope::string &) override { if (NSDefChanstats) na->nc->Extend("NS_STATS"); -- cgit