diff options
| author |  Sadie Powell | 2021-04-06 20:06:18 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-04-07 10:36:11 +0100 |
| commit | 942fd2bcfd384a12c900999fe663202c87319a68 (patch) | |
| tree | c2bad1906af27afbc3c7d96c3e5ca3c27c83f090 /src/modules/extra/m_pgsql.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
Switch simple iterator loops to use range-based for loops.
Diffstat (limited to 'src/modules/extra/m_pgsql.cpp')
| -rw-r--r-- | src/modules/extra/m_pgsql.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index baa22b999..38b07b52e 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -215,9 +215,9 @@ class SQLConn : public SQL::Provider, public EventHandler qinprog.c->OnError(err); delete qinprog.c; } - for(std::deque<QueueItem>::iterator i = queue.begin(); i != queue.end(); i++) + for (const auto& item : queue) { - SQL::Query* q = i->c; + SQL::Query* q = item.c; q->OnError(err); delete q; } @@ -577,10 +577,10 @@ class ModulePgSQL : public Module void ClearAllConnections() { - for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) + for (const auto& [_, conn] : connections) { - i->second->Cull(); - delete i->second; + conn->Cull(); + delete conn; } connections.clear(); } @@ -588,9 +588,8 @@ class ModulePgSQL : public Module void OnUnloadModule(Module* mod) override { SQL::Error err(SQL::BAD_DBID); - for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) + for (const auto& [_, conn] : connections) { - SQLConn* conn = i->second; if (conn->qinprog.c && conn->qinprog.c->creator == mod) { conn->qinprog.c->OnError(err); |