|
From: <sv...@op...> - 2025-11-10 15:39:00
|
Author: manx Date: Mon Nov 10 16:38:49 2025 New Revision: 24419 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24419 Log: Merged revision(s) 24415 from trunk/OpenMPT: [Fix] serialization utils: std::is_trivial is deprecated in C++26. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/common/serialization_utils.h Modified: branches/OpenMPT-1.29/common/serialization_utils.h ============================================================================== --- branches/OpenMPT-1.29/common/serialization_utils.h Mon Nov 10 16:38:30 2025 (r24418) +++ branches/OpenMPT-1.29/common/serialization_utils.h Mon Nov 10 16:38:49 2025 (r24419) @@ -137,7 +137,7 @@ template <class T> inline void WriteItem(std::ostream& oStrm, const T& data) { - static_assert(std::is_trivial<T>::value == true, ""); + static_assert(std::is_trivially_default_constructible<T>::value && std::is_trivially_copyable<T>::value, ""); 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_trivial<T>::value == true, ""); + static_assert(std::is_trivially_default_constructible<T>::value && std::is_trivially_copyable<T>::value, ""); if (nSize == sizeof(T) || nSize == invalidDatasize) Binaryread(iStrm, data); else |