[OMPT-svn-commit] OpenMPT r24423 - in branches/OpenMPT-1.28: . common

[<sv...@op...>]

Author: manx
Date: Mon Nov 10 16:49:16 2025
New Revision: 24423
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24423

Log:
Revert r24420:
Merged revision(s) 24420 from branches/OpenMPT-1.28:
Merged revision(s) 24415 from trunk/OpenMPT:
[Fix] serialization utils: std::is_trivial is deprecated in C++26.
........
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/common/serialization_utils.h

Modified: branches/OpenMPT-1.28/common/serialization_utils.h
==============================================================================
--- branches/OpenMPT-1.28/common/serialization_utils.h	Mon Nov 10 16:43:10 2025	(r24422)
+++ branches/OpenMPT-1.28/common/serialization_utils.h	Mon Nov 10 16:49:16 2025	(r24423)
@@ -137,7 +137,7 @@
 template <class T>
 inline void WriteItem(std::ostream& oStrm, const T& data)
 {
-	static_assert(std::is_trivially_default_constructible<T>::value && std::is_trivially_copyable<T>::value, "");
+	static_assert(std::is_trivial<T>::value == true, "");
 	Binarywrite(oStrm, data);
 }
 
@@ -204,7 +204,7 @@
 template <class T>
 inline void ReadItem(std::istream& iStrm, T& data, const DataSize nSize)
 {
-	static_assert(std::is_trivially_default_constructible<T>::value && std::is_trivially_copyable<T>::value, "");
+	static_assert(std::is_trivial<T>::value == true, "");
 	if (nSize == sizeof(T) || nSize == invalidDatasize)
 		Binaryread(iStrm, data);
 	else