From fd73bd8d3cda1d9e1f76fe38caeb659002322206 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 5 Sep 2021 13:46:39 +0100
Subject: Fix const weirdness in flatmap

---
 icespider/core/flatMap.h        | 5 ++---
 icespider/fcgi/cgiRequestBase.h | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/icespider/core/flatMap.h b/icespider/core/flatMap.h
index db07473..7eb6364 100644
--- a/icespider/core/flatMap.h
+++ b/icespider/core/flatMap.h
@@ -5,10 +5,9 @@
 #include <vector>
 
 namespace IceSpider {
-	template<typename K, typename M, typename Comp = std::less<>>
-	class flatmap : std::vector<std::pair<std::decay_t<K>, std::decay_t<M>>> {
+	template<typename K, typename M, typename Comp = std::less<>> class flatmap : std::vector<std::pair<K, M>> {
 	public:
-		using V = std::pair<std::decay_t<K>, std::decay_t<M>>;
+		using V = std::pair<K, M>;
 		using S = std::vector<V>;
 
 	private:
diff --git a/icespider/fcgi/cgiRequestBase.h b/icespider/fcgi/cgiRequestBase.h
index de99e01..710b0f0 100644
--- a/icespider/fcgi/cgiRequestBase.h
+++ b/icespider/fcgi/cgiRequestBase.h
@@ -15,8 +15,8 @@ namespace IceSpider {
 		void initialize();
 
 	public:
-		using VarMap = flatmap<std::string_view, const std::string_view>;
-		using HdrMap = flatmap<std::string_view, const std::string_view, AdHoc::case_less>;
+		using VarMap = flatmap<std::string_view, std::string_view>;
+		using HdrMap = flatmap<std::string_view, std::string_view, AdHoc::case_less>;
 
 		[[nodiscard]] const PathElements & getRequestPath() const override;
 		[[nodiscard]] PathElements & getRequestPath() override;
-- 
cgit v1.2.3