From f4eb9282e52fa7d072fadf5ec1edc5d2d05ec4e8 Mon Sep 17 00:00:00 2001
From: Deal <halx99@live.com>
Date: Tue, 26 Sep 2023 06:55:58 +0800
Subject: Compile with c++20 support (#920)

* Compile with c++20 support

* Update CMakeLists.txt
---
 common/almalloc.h |  4 +++-
 common/alspan.h   | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/almalloc.h b/common/almalloc.h
index bd2e085b..873473ca 100644
--- a/common/almalloc.h
+++ b/common/almalloc.h
@@ -117,7 +117,9 @@ constexpr T *to_address(T *p) noexcept
 
 template<typename T>
 constexpr auto to_address(const T &p) noexcept
-{ return to_address(p.operator->()); }
+{
+    return ::al::to_address(p.operator->());
+}
 
 
 template<typename T, typename ...Args>
diff --git a/common/alspan.h b/common/alspan.h
index f75bc84f..d5e42324 100644
--- a/common/alspan.h
+++ b/common/alspan.h
@@ -76,9 +76,10 @@ public:
     template<bool is0=(extent == 0), REQUIRES(is0)>
     constexpr span() noexcept { }
     template<typename U>
-    constexpr explicit span(U iter, index_type) : mData{to_address(iter)} { }
+    constexpr explicit span(U iter, index_type) : mData{::al::to_address(iter)} { }
     template<typename U, typename V, REQUIRES(!std::is_convertible<V,size_t>::value)>
-    constexpr explicit span(U first, V) : mData{to_address(first)} { }
+    constexpr explicit span(U first, V) : mData{::al::to_address(first)}
+    {}
 
     constexpr span(type_identity_t<element_type> (&arr)[E]) noexcept
         : span{std::data(arr), std::size(arr)}
@@ -191,11 +192,10 @@ public:
 
     constexpr span() noexcept = default;
     template<typename U>
-    constexpr span(U iter, index_type count)
-        : mData{to_address(iter)}, mDataEnd{to_address(iter)+count}
+    constexpr span(U iter, index_type count) : mData{::al::to_address(iter)}, mDataEnd{::al::to_address(iter) + count}
     { }
     template<typename U, typename V, REQUIRES(!std::is_convertible<V,size_t>::value)>
-    constexpr span(U first, V last) : span{to_address(first), static_cast<size_t>(last-first)}
+    constexpr span(U first, V last) : span{::al::to_address(first), static_cast<size_t>(last - first)}
     { }
 
     template<size_t N>
-- 
cgit v1.2.3