Fix macos build

Author: gracicot

CMakeLists.txt

@@ -37,6 +37,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19)
 		set(KANGARU_HAS_CPP_MODULES ON)
 	endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+	set(KANGARU_HAS_CPP_MODULES OFF)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	set(KANGARU_HAS_CPP_MODULES OFF) # GCC 15 simply ICE with modules
 elseif(MSVC)

include/kangaru/detail/any_source_of.hpp

@@ -5,6 +5,7 @@
 #include "concepts.hpp"
 #include "type_traits.hpp"
 #include "constructor.hpp"
+#include <new>
 
 #ifndef KANGARU5_MODULES
 #include <utility>
@@ -30,13 +31,13 @@ KANGARU5_EXPORT namespace kangaru {
 				and ... and source_of<detail::type_traits::call_result_t<Function>, Types>
 			)
 		explicit(false) constexpr any_source_of(in_place_construct<Function> source) :
-			source{new detail::type_traits::call_result_t<Function>(source)},
-			source_vtable{get_vtable_for<detail::type_traits::call_result_t<Function>>()} {}
+			source_vtable{get_vtable_for<detail::type_traits::call_result_t<Function>>()},
+			source{new detail::type_traits::call_result_t<Function>(std::move(source))} {}
 
 		template<not_self<any_source_of> Source> requires(forwarded_source<Source> and ... and source_of<Source&, Types>)
 		explicit(false) constexpr any_source_of(Source&& source) :
-			source{new Source{KANGARU5_FWD(source)}},
-			source_vtable{get_vtable_for<std::remove_cvref_t<Source>>()} {}
+			source_vtable{get_vtable_for<std::remove_cvref_t<Source>>()},
+			source{new Source{KANGARU5_FWD(source)}} {}
 
 		template<not_self<any_source_of> Source> requires(forwarded_source<Source> and ... and source_of<Source&, Types>)
 		constexpr auto operator=(Source&& rhs) -> any_source_of& {
@@ -52,11 +53,14 @@ KANGARU5_EXPORT namespace kangaru {
 		any_source_of(any_source_of const&) = delete;
 		auto operator=(any_source_of const&) -> any_source_of& = delete;
 
-		constexpr any_source_of(any_source_of&& other) noexcept : source{std::exchange(other.source, nullptr)}, source_vtable{std::exchange(other.source_vtable, {})} {}
+		constexpr any_source_of(any_source_of&& other) noexcept :
+			source_vtable{std::exchange(other.source_vtable, {})},
+			source{std::exchange(other.source, nullptr)} {}
 
 		constexpr auto operator=(any_source_of&& rhs) -> any_source_of& {
-			std::ranges::swap(source, rhs.source);
+			if (this == &rhs) return *this;
 			std::swap(source_vtable, rhs.source_vtable);
+			std::swap(source, rhs.source);
 			return *this;
 		}
 

include/kangaru/detail/heap_storage.hpp

@@ -33,6 +33,7 @@ namespace kangaru {
 			ptr{std::exchange(other.ptr, nullptr)}, deleter{std::exchange(other.deleter, nullptr)} {}
 
 		constexpr auto operator=(runtime_dynamic_storage&& rhs) noexcept -> runtime_dynamic_storage& {
+			if (this == &rhs) return *this;
 			std::ranges::swap(ptr, rhs.ptr);
 			std::ranges::swap(deleter, rhs.deleter);
 			return *this;
@@ -112,6 +113,7 @@ namespace kangaru {
 			allocator{std::move(other.allocator)}, container{std::move(other.container)} {}
 
 		constexpr auto operator=(basic_heap_storage&& rhs) noexcept -> basic_heap_storage& {
+			if (this == &rhs) return *this;
 			std::ranges::swap(allocator, rhs.allocator);
 			std::ranges::swap(container, rhs.container);
 			return *this;

include/kangaru/detail/polymorphic_source.hpp

@@ -93,12 +93,12 @@ namespace kangaru {
 		}
 
 		template<injectable T>
-		constexpr auto operator=(polymorphic_source<T> const& other) -> type_erased_source_reference& {
-			source = other.source;
+		constexpr auto operator=(polymorphic_source<T> const& rhs) -> type_erased_source_reference& {
+			source = rhs.source;
 
 			std::construct_at(
 				static_cast<function_container<T>*>(static_cast<void*>(function_container_type_erased)),
-				other.provide_function
+				rhs.provide_function
 			);
 
 			return *this;

tests/src/5-modular-source.cpp

@@ -165,27 +165,51 @@ namespace kangaru {
 
 	template<source... Sources, source Source>
 	inline constexpr auto make_modular_source(Source source) {
-		return modular_source<Source, kangaru::constructor_function<Sources>...>{std::move(source), kangaru::constructor_function<Sources>{}...};
+		return modular_source<Source, kangaru::constructor_function<Sources>...>{
+			std::move(source),
+			kangaru::constructor_function<Sources>{}...
+		};
 	}
 
 	template<source... Sources>
 	inline constexpr auto make_modular_source() {
-		return modular_source<none_source, kangaru::constructor_function<Sources>...>{none_source{}, kangaru::constructor_function<Sources>{}...};
+		return modular_source<none_source, kangaru::constructor_function<Sources>...>{
+			none_source{},
+			kangaru::constructor_function<Sources>{}...
+		};
 	}
 
 	template<source Source, typename... Lambdas>
 	inline constexpr auto make_modular_source_in_place(Source source, Lambdas... lambdas) {
-		return in_place_construct{[&]{ return modular_source<Source, Lambdas...>{std::move(source), lambdas...}; }};
+		return in_place_construct{
+			[source = std::move(source), ...lambdas = std::move(lambdas)]() mutable {
+				return modular_source<Source, Lambdas...>{std::move(source), lambdas...};
+			},
+		};
 	}
 
 	template<source... Sources, source Source>
 	inline constexpr auto make_modular_source_in_place(Source source) {
-		return in_place_construct{[&]{ return modular_source<Source, kangaru::constructor_function<Sources>...>{std::move(source), kangaru::constructor_function<Sources>{}...}; }};
+		return in_place_construct{
+			[source = std::move(source)]() mutable {
+				return modular_source<Source, kangaru::constructor_function<Sources>...>{
+					std::move(source),
+					kangaru::constructor_function<Sources>{}...
+				};
+			},
+		};
 	}
 
 	template<source... Sources>
 	inline constexpr auto make_modular_source_in_place() {
-		return in_place_construct{[&]{ return modular_source<none_source, kangaru::constructor_function<Sources>...>{none_source{}, kangaru::constructor_function<Sources>{}...}; }};
+		return in_place_construct{
+			[] {
+				return modular_source<none_source, kangaru::constructor_function<Sources>...>{
+					none_source{},
+					kangaru::constructor_function<Sources>{}...
+				};
+			},
+		};
 	}
 
 	template<typename... Modules>