fix(basic-iterator): fix msvc errors

c0nstexpr · c0nstexpr · commit 713f189e8522 · 2024-04-23T10:59:39.000+08:00
diff --git a/include/stdsharp/iterator/basic_iterator.h b/include/stdsharp/iterator/basic_iterator.h
@@ -21,6 +21,11 @@ namespace stdsharp
         default_operator::subscript,
         default_operator::plus_commutative
     {
+    private:
+        template<typename T>
+        static constexpr auto has_mem_data = requires(T& t) { t.data(); };
+
+    public:
         template<typename T>
         using difference_type = std::iter_difference_t<decltype(std::declval<const T&>().data())>;
 
@@ -33,55 +38,61 @@ namespace stdsharp
         using increase::operator--;
         using arithmetic::operator-;
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<T>
         constexpr auto& operator++(this T& t) noexcept(noexcept(++t.data()))
-            requires requires { ++t.data(); }
         {
             ++t.data();
             return t;
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<T>
         constexpr auto& operator--(this T& t) noexcept(noexcept(--t.data()))
             requires requires { --t.data(); }
         {
             --t.data();
             return t;
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<T>
         constexpr auto& operator+=(this T& t, const difference_type<T>& diff) noexcept
             requires requires { t.data() += diff; }
         {
             t.data() += diff;
             return t;
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<T>
         constexpr auto& operator-=(this T& t, const difference_type<T>& diff) noexcept
             requires requires { t.data() -= diff; }
         {
             t.data() -= diff;
             return t;
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<const T>
         [[nodiscard]] constexpr decltype(auto) operator-(this const T& left, decltype(left) right)
             noexcept(noexcept(left.data() - right.data()))
             requires requires { left.data() - right.data(); }
         {
             return left.data() - right.data();
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<const T>
         [[nodiscard]] constexpr decltype(auto) operator<=>(this const T& left, decltype(left) right)
             noexcept(noexcept(left.data() <=> right.data()))
             requires requires { left.data() <=> right.data(); }
         {
             return left.data() <=> right.data();
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<const T>
         [[nodiscard]] constexpr decltype(auto) operator==(this const T& left, decltype(left) right)
             noexcept(noexcept(left.data() == right.data()))
             requires requires { left.data() == right.data(); }
@@ -98,7 +109,8 @@ namespace stdsharp
         static constexpr void not_null(const auto& /*unused*/) noexcept {}
 
     public:
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<const T>
         [[nodiscard]] constexpr decltype(auto) operator*(this const T& t)
             noexcept(noexcept(*(t.data())))
             requires requires { *(t.data()); }
@@ -108,7 +120,8 @@ namespace stdsharp
             return *ptr;
         }
 
-        template<details::iterator_has_mem_data T>
+        template<typename T>
+            requires has_mem_data<const T>
         [[nodiscard]] constexpr decltype(auto) operator[]( //
             this const T& t,
             const difference_type<T>& diff
diff --git a/include/stdsharp/memory/launder_iterator.h b/include/stdsharp/memory/launder_iterator.h
@@ -5,10 +5,14 @@
 
 #include <new>
 
+#include "../compilation_config_in.h"
+
 namespace stdsharp
 {
     template<typename T>
-    class launder_iterator : public basic_iterator
+    class STDSHARP_EBO launder_iterator :
+        public basic_iterator,
+        public std::random_access_iterator_tag
     {
         T* ptr_;
 
@@ -39,4 +43,6 @@ namespace stdsharp
 
     template<typename T>
     launder_iterator(T*) -> launder_iterator<T>;
-}
+}
+
+#include "../compilation_config_out.h"
