fix(*all*): correct headers

Author: c0nstexpr

include/stdsharp/array/array.h

@@ -4,19 +4,23 @@
 #include <algorithm>
 #include <ranges>
 
+#include "../macros.h"
+
 namespace stdsharp
 {
     template<::std::size_t N>
     struct range_to_array_fn
     {
         template<typename Rng, typename Proj = ::std::identity>
-        constexpr auto operator()(Rng&& rng, Proj&& proj = {}) const
+        constexpr auto operator()(Rng&& rng, Proj proj = {}) const
         {
-            ::std::array<::std::projected<::std::ranges::iterator_t<Rng>, Proj>, N> arr{};
+            using value_type = ::std::projected<::std::ranges::iterator_t<Rng>, Proj>::value_type;
+
+            ::std::array<value_type, N> arr{};
 
             ::std::ranges::copy(
                 cpp_forward(rng) | //
-                    ::std::views::transform(cpp_forward(proj)) | //
+                    ::std::views::transform(proj) | //
                     ::std::views::take(N),
                 arr.begin()
             );

include/stdsharp/concepts/concepts.h

@@ -3,9 +3,9 @@
 //
 #pragma once
 
+#include <compare>
 #include <concepts>
 #include <type_traits>
-#include <utility>
 
 #include "../macros.h"
 
@@ -288,14 +288,13 @@ namespace stdsharp
     template<typename T>
     concept nothrow_move_assignable = ::std::is_nothrow_move_assignable_v<T>;
 
-    template<typename T>
-    concept nothrow_swappable =
-        requires(T& t1, T& t2) { requires noexcept(::std::ranges::swap(t1, t2)); };
-
     template<typename T, typename U>
     concept nothrow_swappable_with =
         requires(T& t, U& u) { requires noexcept(::std::ranges::swap(t, u)); };
 
+    template<typename T>
+    concept nothrow_swappable = nothrow_swappable_with<T, T>;
+
     template<typename T>
     concept nothrow_movable = ::std::movable<T> && //
         nothrow_move_constructible<T> &&
@@ -320,11 +319,11 @@ namespace stdsharp
     concept nothrow_convertible_to = ::std::is_nothrow_convertible_v<T, U>;
 
     template<typename From, typename To>
-    concept explicitly_convertible = requires { static_cast<To>(std::declval<From>()); };
+    concept explicitly_convertible = requires(From&& v) { static_cast<To>(cpp_forward(v)); };
 
     template<typename From, typename To>
     concept nothrow_explicitly_convertible =
-        requires { requires noexcept(static_cast<To>(std::declval<From>())); };
+        requires(From&& v) { requires noexcept(static_cast<To>(cpp_forward(v))); };
 
     template<typename To, typename From>
     concept explicitly_convertible_from = explicitly_convertible<From, To>;

include/stdsharp/memory/memory.h

@@ -1,6 +1,4 @@
 #pragma once
 
-#include "pointer_traits.h"
-#include "single_static_buffer.h"
-#include "static_allocator.h"
-#include "raii_memory.h"
+#include "small_object_optimization.h"
+#include "allocator_reference.h"

include/stdsharp/type_traits/type_traits.h

@@ -1,4 +1,5 @@
 #pragma once
 
 #include "member.h"
-#include "object.h"
+#include "object.h"
+#include "type_sequence.h"

include/stdsharp/utility/adl_proof.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <concepts>
-
 namespace stdsharp
 {
     namespace details

include/stdsharp/utility/invocable.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../utility/value_wrapper.h"
+#include "value_wrapper.h"
 
 namespace stdsharp
 {

include/stdsharp/utility/utility.h

@@ -1,14 +1,11 @@
 
 #pragma once
 
-#include <utility>
-
 #include "auto_cast.h"
 #include "cast_to.h"
 #include "constructor.h"
 #include "invocable.h"
 #include "../type_traits/core_traits.h"
-#include "value_wrapper.h"
 
 namespace stdsharp
 {

include/stdsharp/utility/value_wrapper.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "../concepts/concepts.h"
 #include "../compilation_config_in.h"