fix serialization constraints (for clang 22)

Author: malytomas

sources/include/cage-core/containerSerialization.h

@@ -84,7 +84,7 @@ namespace cage
 			c.empty();
 			typename C::value_type;
 			c.insert(c.end(), *c.begin());
-		} && SerializableConcept<typename C::value_type>;
+		};
 
 		template<class C>
 		concept MemcpyContainerConcept = WritableContainerConcept<C> && requires(C c) { c.data(); } && MemcpyableConcept<typename C::value_type>;
@@ -177,7 +177,6 @@ namespace cage
 	// overload for pointer range
 
 	template<class T>
-	requires requires(Serializer s, T v) { s << v; } // requires <<, but not >>
 	Serializer &operator<<(Serializer &s, PointerRange<T> c)
 	{
 		s << numeric_cast<uint64>(c.size());

sources/include/cage-core/serialization.h

@@ -144,18 +144,10 @@ namespace cage
 		return s;
 	}
 
-	namespace privat
-	{
-		template<class T>
-		concept SerializableConcept = requires(Serializer s, Deserializer d, T v) {
-			d >> v;
-			s << v;
-		};
-	}
-
 	// r-value deserializer
 
-	Deserializer &&operator>>(Deserializer &&s, privat::SerializableConcept auto &v)
+	template<class T>
+	Deserializer &&operator>>(Deserializer &&s, T &v)
 	{
 		s >> v;
 		return std::move(s);
@@ -164,7 +156,7 @@ namespace cage
 	// overloads for c array
 
 	template<class T, uintPtr N>
-	requires(privat::SerializableConcept<T>)
+	requires(privat::WritableConcept<T>)
 	Serializer &operator<<(Serializer &s, const T (&v)[N])
 	{
 		for (auto &it : v)
@@ -173,7 +165,7 @@ namespace cage
 	}
 
 	template<class T, uintPtr N>
-	requires(privat::SerializableConcept<T>)
+	requires(privat::WritableConcept<T>)
 	Deserializer &operator>>(Deserializer &s, T (&v)[N])
 	{
 		for (auto &it : v)
@@ -203,15 +195,13 @@ namespace cage
 	// overloads for std::pair
 
 	template<class A, class B>
-	requires(privat::SerializableConcept<A> && privat::SerializableConcept<B>)
 	Serializer &operator<<(Serializer &s, const std::pair<A, B> &p)
 	{
 		s << p.first << p.second;
 		return s;
 	}
 
 	template<class A, class B>
-	requires(privat::SerializableConcept<std::remove_const_t<A>> && privat::SerializableConcept<B>)
 	Deserializer &operator>>(Deserializer &s, std::pair<A, B> &p)
 	{
 		s >> const_cast<std::remove_const_t<A> &>(p.first) >> p.second;

sources/test-core/serialization.cpp

@@ -29,10 +29,6 @@ void testSerialization()
 		static_assert(!privat::WritableConcept<PointerRange<uint32>>);
 		static_assert(!privat::WritableConcept<PointerRange<const uint32>>);
 		static_assert(!privat::WritableConcept<PointerRange<String>>);
-		static_assert(privat::SerializableConcept<uint32>);
-		static_assert(privat::SerializableConcept<String>);
-		static_assert(privat::SerializableConcept<std::pair<String, uint32>>);
-		static_assert(privat::SerializableConcept<std::pair<const String, uint32>>); // used in std::map
 	}
 
 	{