From 4cb5c3782b5588efbc463fe49d2fe242c0385c3e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Wed, 29 Jun 2022 17:22:11 +0200
Subject: [PATCH] util/HexFormat: require std::span

---
 src/util/HexFormat.hxx | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/util/HexFormat.hxx b/src/util/HexFormat.hxx
index c1b0708cf..2ca035d20 100644
--- a/src/util/HexFormat.hxx
+++ b/src/util/HexFormat.hxx
@@ -34,6 +34,7 @@
 
 #include <array>
 #include <cstdint>
+#include <span>
 
 constexpr char hex_digits[] = "0123456789abcdef";
 
@@ -81,14 +82,6 @@ HexFormatUint64Fixed(char dest[16], uint64_t number) noexcept
 	return dest;
 }
 
-#if __cplusplus >= 202002 || (defined(__GNUC__) && __GNUC__ >= 10)
-#include <version>
-#endif
-
-#ifdef __cpp_lib_span
-#include <array>
-#include <span>
-
 /**
  * Format the given input buffer of bytes to hex.  The caller ensures
  * that the output buffer is at least twice as large as the input.
@@ -117,5 +110,3 @@ HexFormat(std::span<const std::byte, size> input) noexcept
 	HexFormat(output.data(), input);
 	return output;
 }
-
-#endif