summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-09-05 13:46:39 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2021-12-17 15:36:04 +0000
commitfd73bd8d3cda1d9e1f76fe38caeb659002322206 (patch)
tree309366337b557ad5dfb0c5ecc7d1834dea998885
parentAdd more perf tests (diff)
downloadicespider-fd73bd8d3cda1d9e1f76fe38caeb659002322206.tar.bz2
icespider-fd73bd8d3cda1d9e1f76fe38caeb659002322206.tar.xz
icespider-fd73bd8d3cda1d9e1f76fe38caeb659002322206.zip
Fix const weirdness in flatmap
-rw-r--r--icespider/core/flatMap.h5
-rw-r--r--icespider/fcgi/cgiRequestBase.h4
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;