From e131f226429109c920f85bb863fd5c3fcc425368 Mon Sep 17 00:00:00 2001
From: Max Kellermann <mk@cm4all.com>
Date: Mon, 8 Apr 2024 21:01:54 +0200
Subject: [PATCH] util/SpanCast: merge two ToStringView() using
 std::remove_const_t

---
 src/util/SpanCast.hxx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/util/SpanCast.hxx b/src/util/SpanCast.hxx
index b99e5111e..d786f9d89 100644
--- a/src/util/SpanCast.hxx
+++ b/src/util/SpanCast.hxx
@@ -9,6 +9,7 @@
 #include <cstddef>
 #include <span>
 #include <string_view>
+#include <type_traits>
 
 /**
  * Cast a std::span<std::byte> to a std::span<T>, rounding down to the
@@ -95,14 +96,7 @@ ToStringView(std::span<std::byte> s) noexcept
 }
 
 template<typename T>
-constexpr std::basic_string_view<T>
-ToStringView(std::span<const T> s) noexcept
-{
-	return {s.data(), s.size()};
-}
-
-template<typename T>
-constexpr std::basic_string_view<T>
+constexpr std::basic_string_view<std::remove_const_t<T>>
 ToStringView(std::span<T> s) noexcept
 {
 	return {s.data(), s.size()};