From d247b77a1ead9f55df938d6abaecdaff2c68c9c8 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Mon, 31 Jan 2022 12:22:00 +0000
Subject: Move stdalgo::map::difference to its own utility header.

---
 src/coremods/core_info/isupport.cpp  | 4 +++-
 src/modules.cpp                      | 3 ++-
 src/modules/m_spanningtree/capab.cpp | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/coremods/core_info/isupport.cpp b/src/coremods/core_info/isupport.cpp
index 6c6150ec8..7cc2f1135 100644
--- a/src/coremods/core_info/isupport.cpp
+++ b/src/coremods/core_info/isupport.cpp
@@ -18,6 +18,8 @@
 
 
 #include "inspircd.h"
+#include "utility/map.h"
+
 #include "core_info.h"
 
 namespace
@@ -25,7 +27,7 @@ namespace
 	void TokenDifference(ISupport::TokenMap& tokendiff, const ISupport::TokenMap& oldtokens, const ISupport::TokenMap& newtokens)
 	{
 		std::map<std::string, std::pair<std::optional<std::string>, std::optional<std::string>>, irc::insensitive_swo> changedtokens;
-		stdalgo::map::difference(oldtokens, newtokens, changedtokens);
+		insp::map::difference(oldtokens, newtokens, changedtokens);
 		for (const auto& [name, values] : changedtokens)
 		{
 			if (values.first && !values.second)
diff --git a/src/modules.cpp b/src/modules.cpp
index 5cff6ac29..37cf9954b 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -35,6 +35,7 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
+#include "utility/map.h"
 
 // Needs to be included after inspircd.h to avoid reincluding winsock.
 #include <rang/rang.hpp>
@@ -68,7 +69,7 @@ void Module::CompareLinkData(const LinkData& otherdata, LinkDataDiff& diffs)
 	std::string unused;
 	LinkData data;
 	this->GetLinkData(data, unused);
-	stdalgo::map::difference(data, otherdata, diffs);
+	insp::map::difference(data, otherdata, diffs);
 }
 
 std::string Module::GetPropertyString() const
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index d45f2375c..2bc7f9e47 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -26,12 +26,13 @@
 
 
 #include "inspircd.h"
+#include "modules/extban.h"
+#include "utility/map.h"
 
 #include "treeserver.h"
 #include "utils.h"
 #include "link.h"
 #include "main.h"
-#include "modules/extban.h"
 
 namespace
 {
@@ -114,7 +115,7 @@ namespace
 		// Retrieve the local module list and compare to the remote.
 		CapabData::ModuleMap mymodules = BuildModuleList(property, PROTO_INSPIRCD_3);
 		TokenDiff modulediff;
-		stdalgo::map::difference(mymodules, remote, modulediff);
+		insp::map::difference(mymodules, remote, modulediff);
 
 		for (const auto& [module, values] : modulediff)
 		{
-- 
cgit v1.3.1-10-gc9f91