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/m_spanningtree/utils.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/modules/m_spanningtree/utils.cpp') diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index dd4575445..8c3786aff 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -254,10 +254,9 @@ void SpanningTreeUtilities::ReadConfiguration() AutoconnectBlocks.clear(); LinkBlocks.clear(); - ConfigTagList tags = ServerInstance->Config->ConfTags("link"); - for(ConfigIter i = tags.first; i != tags.second; ++i) + + for (auto& [_, tag] : ServerInstance->Config->ConfTags("link")) { - ConfigTag* tag = i->second; auto L = std::make_shared(tag); irc::spacesepstream sep = tag->getString("allowmask"); @@ -310,10 +309,8 @@ void SpanningTreeUtilities::ReadConfiguration() LinkBlocks.push_back(L); } - tags = ServerInstance->Config->ConfTags("autoconnect"); - for(ConfigIter i = tags.first; i != tags.second; ++i) + for (auto& [_, tag] : ServerInstance->Config->ConfTags("autoconnect")) { - ConfigTag* tag = i->second; auto A = std::make_shared(tag); A->Period = tag->getDuration("period", 60, 1); A->NextConnectTime = ServerInstance->Time() + A->Period; -- cgit v1.3.1-10-gc9f91