From 3f113fc04628491cb795d2fc809d89ff2379c61a Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 2 Mar 2021 02:44:41 +0000
Subject: Move iterator_range to the utility directory and renamespace.

---
 src/configreader.cpp          | 4 ++--
 src/mode.cpp                  | 6 +++---
 src/modules/m_alias.cpp       | 4 ++--
 src/modules/m_chanlog.cpp     | 2 +-
 src/modules/m_customtitle.cpp | 2 +-
 src/modules/m_vhost.cpp       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

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]))
 			{
-- 
cgit v1.3.1-10-gc9f91