diff options
| author | Adam <adam@sigterm.info> | 2015-08-18 11:49:55 -0400 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2015-08-18 11:49:55 -0400 |
| commit | ad3b14c5a20353e65a1b96ee2309a904bf4d5329 (patch) | |
| tree | 4de83e16dd98be6a23e2a451fe3fd798de58c09a | |
| parent | d79d8e2608e304760c42bdf87502e3bc51781b88 (diff) | |
| parent | 7a15dd936f876882999a18117937d2eeef2e7dc0 (diff) | |
Merge pull request #124 from SaberUK/2.1+warnings-errors
Fix various Clang warnings and errors.
| -rw-r--r-- | include/modules/sql.h | 2 | ||||
| -rw-r--r-- | include/services.h | 1 | ||||
| -rw-r--r-- | modules/database/db_sql.cpp | 4 | ||||
| -rw-r--r-- | modules/pseudoclients/chanserv/chanserv.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/modules/sql.h b/include/modules/sql.h index 826219b53..49c92ccd0 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -100,7 +100,7 @@ namespace SQL inline operator bool() const { return this->error.empty(); } - inline const unsigned int GetID() const { return this->id; } + inline unsigned int GetID() const { return this->id; } inline const Query &GetQuery() const { return this->query; } inline const Anope::string &GetError() const { return this->error; } diff --git a/include/services.h b/include/services.h index b29773242..ad9a4c78c 100644 --- a/include/services.h +++ b/include/services.h @@ -42,6 +42,7 @@ #include <algorithm> #include <iterator> #include <regex> +#include <stack> #include "defs.h" diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 4f6a1e909..fed0050e4 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -270,8 +270,8 @@ class DBMySQL : public Module, public Pipe else q.SetNull(field->GetName()); - for (Query &q : SQL->Replace(prefix + object->GetSerializableType()->GetName(), q, { "id" })) - Run(q); + for (Query &q2 : SQL->Replace(prefix + object->GetSerializableType()->GetName(), q, { "id" })) + Run(q2); } public: diff --git a/modules/pseudoclients/chanserv/chanserv.cpp b/modules/pseudoclients/chanserv/chanserv.cpp index 3bab894e9..5dd83188f 100644 --- a/modules/pseudoclients/chanserv/chanserv.cpp +++ b/modules/pseudoclients/chanserv/chanserv.cpp @@ -310,7 +310,7 @@ class ChanServCore : public Module void OnDelCore(NickServ::Account *nc) override { - int max_reg = Config->GetModule(this)->Get<int>("maxregistered"); + unsigned int max_reg = Config->GetModule(this)->Get<unsigned int>("maxregistered"); for (ChanServ::Channel *ci : nc->GetRefs<ChanServ::Channel *>(ChanServ::channel)) { if (ci->GetFounder() == nc) |