Move iterator_range to the utility directory and renamespace.

9 files changed, 15 insertions, 14 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 88a444840..a472144f6 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -300,7 +300,7 @@ class CoreExport ServerConfig
 	typedef std::multimap<std::string, std::shared_ptr<ConfigTag>, irc::insensitive_swo> TagMap;
 
 	/** Holds iterators to a subsection of the server config map. */
-	typedef stdalgo::iterator_range<TagMap::const_iterator> TagList;
+	typedef insp::iterator_range<TagMap::const_iterator> TagList;
 
 	/** Get a configuration tag by name. If one or more tags are present then the first is returned.
 	 * @param tag The name of the tag to get.
diff --git a/include/inspircd.h b/include/inspircd.h
index d3ddee776..ffff42be0 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -57,11 +57,12 @@
 #include <unordered_map>
 #include <vector>
 
+#include "utility/iterator_range.h"
+
 #include "intrusive_list.h"
 #include "flat_map.h"
 #include "compat.h"
 #include "aligned_storage.h"
-#include "iterator_range.h"
 #include "typedefs.h"
 #include "convto.h"
 #include "stdalgo.h"
diff --git a/include/iterator_range.h b/include/utility/iterator_range.h
index e760646d5..ff8d8d10e 100644
--- a/include/iterator_range.h
+++ b/include/utility/iterator_range.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-namespace stdalgo
+namespace insp
 {
 	template <typename Iterator>
 	class iterator_range;
@@ -37,7 +37,7 @@ namespace stdalgo
 
 /** Represents a range of iterators. */
 template <typename Iterator>
-class stdalgo::iterator_range
+class insp::iterator_range final
 {
  private:
 	/** An iterator which points to the start of the range. */
diff --git a/src/configreader.cpp b/src/configreader.cpp
index ac3a2e811..563e1fe08 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -617,7 +617,7 @@ void ServerConfig::ApplyModules(User* user)
 
 std::shared_ptr<ConfigTag> ServerConfig::ConfValue(const std::string& tag, std::shared_ptr<ConfigTag> def)
 {
-	auto tags = stdalgo::equal_range(config_data, tag);
+	auto tags = insp::equal_range(config_data, tag);
 	if (tags.empty())
 		return def ? def : EmptyTag;
 
@@ -631,7 +631,7 @@ std::shared_ptr<ConfigTag> ServerConfig::ConfValue(const std::string& tag, std::
 
 ServerConfig::TagList ServerConfig::ConfTags(const std::string& tag, std::optional<TagList> def)
 {
-	auto range = stdalgo::equal_range(config_data, tag);
+	auto range = insp::equal_range(config_data, tag);
 	return range.empty() && def ? *def : range;
 }
 
diff --git a/src/mode.cpp b/src/mode.cpp
index ddcddda6a..59f8dd4e0 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -305,7 +305,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode
 	}
 
 	// Ask mode watchers whether this mode change is OK
-	for (const auto& [_, mw] : stdalgo::equal_range(modewatchermap, mh->name))
+	for (const auto& [_, mw] : insp::equal_range(modewatchermap, mh->name))
 	{
 		if (mw->GetModeType() == type)
 		{
@@ -343,7 +343,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode
 	if (ma != MODEACTION_ALLOW)
 		return ma;
 
-	for (const auto& [_, mw] : stdalgo::equal_range(modewatchermap, mh->name))
+	for (const auto& [_, mw] : insp::equal_range(modewatchermap, mh->name))
 	{
 		if (mw->GetModeType() == type)
 			mw->AfterMode(user, targetuser, chan, parameter, adding);
@@ -509,7 +509,7 @@ void ModeParser::ShowListModeList(User* user, Channel* chan, ModeHandler* mh)
 		bool display = true;
 
 		// Ask mode watchers whether it's OK to show the list
-		for (const auto& [_, mw] : stdalgo::equal_range(modewatchermap, mh->name))
+		for (const auto& [_, mw] : insp::equal_range(modewatchermap, mh->name))
 		{
 			if (mw->GetModeType() == MODETYPE_CHANNEL)
 			{
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 12a6ba833..aa040bf9c 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -166,7 +166,7 @@ class ModuleAlias : public Module
 			return MOD_RES_PASSTHRU;
 
 		/* We dont have any commands looking like this? Stop processing. */
-		auto aliases = stdalgo::equal_range(Aliases, command);
+		auto aliases = insp::equal_range(Aliases, command);
 		if (aliases.empty())
 			return MOD_RES_PASSTHRU;
 
@@ -240,7 +240,7 @@ class ModuleAlias : public Module
 		// nor do we give a shit about the prefix
 		scommand.erase(0, fprefix.size());
 
-		auto aliases = stdalgo::equal_range(Aliases, scommand);
+		auto aliases = insp::equal_range(Aliases, scommand);
 		if (aliases.empty())
 			return;
 
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 1d6c96282..692b25352 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -64,7 +64,7 @@ class ModuleChanLog : public Module
 
 	ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) override
 	{
-		auto channels = stdalgo::equal_range(logstreams, sno);
+		auto channels = insp::equal_range(logstreams, sno);
 		if (channels.empty())
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index d98ded7b7..05120f930 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -84,7 +84,7 @@ class CommandTitle : public Command
 
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
-		for (const auto& [_, config] : stdalgo::equal_range(configs, parameters[0]))
+		for (const auto& [_, config] : insp::equal_range(configs, parameters[0]))
 		{
 			if (config.MatchUser(user) && config.CheckPass(user, parameters[1]))
 			{
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 615272ef0..79915e0ed 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -64,7 +64,7 @@ class CommandVhost : public Command
 
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
-		for (const auto& [_, config] : stdalgo::equal_range(vhosts, parameters[0]))
+		for (const auto& [_, config] : insp::equal_range(vhosts, parameters[0]))
 		{
 			if (config.CheckPass(user, parameters[1]))
 			{