From 32648f6bb0d92ee3d1f8f446a6bce62a3e8b432b Mon Sep 17 00:00:00 2001
From: Jeroen Vermeulen <jtvjtv@gmail.com>
Date: Sat, 5 Aug 2023 14:56:49 +0200
Subject: [PATCH] There is no `PQXX_HAVE_RANGES`.

Fixes #721.
---
 include/pqxx/blob.hxx    | 6 ++++--
 include/pqxx/strconv.hxx | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/pqxx/blob.hxx b/include/pqxx/blob.hxx
index 5ebbd82f5..f49f2860d 100644
--- a/include/pqxx/blob.hxx
+++ b/include/pqxx/blob.hxx
@@ -23,11 +23,13 @@
 #  include <filesystem>
 #endif
 
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
+// C++20: Assume support.
+#if __has_include(<ranges>)
 #  include <ranges>
 #endif
 
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
+// C++20: Assume support.
+#if __has_include(<span>)
 #  include <span>
 #endif
 
diff --git a/include/pqxx/strconv.hxx b/include/pqxx/strconv.hxx
index 3d0da1935..04acd6daa 100644
--- a/include/pqxx/strconv.hxx
+++ b/include/pqxx/strconv.hxx
@@ -16,17 +16,15 @@
 #endif
 
 #include <algorithm>
+#include <charconv>
 #include <cstring>
 #include <limits>
 #include <sstream>
 #include <stdexcept>
 #include <typeinfo>
 
-#if __has_include(<charconv>)
-#  include <charconv>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
+// C++20: Assume support.
+#if __has_include(<ranges>)
 #  include <ranges>
 #endif