From 441bd151da733d32e194de6e4a1744ae273b83ee Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 31 Oct 2020 20:03:19 +0000 Subject: Add stdalgo::iterator_range and switch config tag reading to use it. This allows us to use range-based for loops which were not possible with the previous config tag system. --- src/modules/extra/m_mysql.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/modules/extra/m_mysql.cpp') diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 622bb7e24..40d3f107a 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -467,16 +467,17 @@ ModuleSQL::~ModuleSQL() void ModuleSQL::ReadConfig(ConfigStatus& status) { ConnMap conns; - ConfigTagList tags = ServerInstance->Config->ConfTags("database"); - for(ConfigIter i = tags.first; i != tags.second; i++) + + for (auto& [_, tag] : ServerInstance->Config->ConfTags("database")) { - if (!stdalgo::string::equalsci(i->second->getString("module"), "mysql")) + if (!stdalgo::string::equalsci(tag->getString("module"), "mysql")) continue; - std::string id = i->second->getString("id"); + + std::string id = tag->getString("id"); ConnMap::iterator curr = connections.find(id); if (curr == connections.end()) { - SQLConnection* conn = new SQLConnection(this, i->second); + SQLConnection* conn = new SQLConnection(this, tag); conns.insert(std::make_pair(id, conn)); ServerInstance->Modules.AddService(*conn); } -- cgit v1.3.1-10-gc9f91