There is no PQXX_HAVE_RANGES. (#722)

Fixes #721.
jtv · Aug 5, 2023 · 77e1e08 · 77e1e08
1 parent bc7d3d1
commit 77e1e08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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