|
From: <sv...@op...> - 2025-11-10 15:43:16
|
Author: manx Date: Mon Nov 10 16:43:10 2025 New Revision: 24422 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24422 Log: Merged revision(s) 24421 from trunk/OpenMPT: [Var] ASIO::Modern: Update to v0.12.11 ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/include/asiomodern/OpenMPT.txt branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOVersion.hpp branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp Modified: branches/OpenMPT-1.32/include/asiomodern/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.32/include/asiomodern/OpenMPT.txt Mon Nov 10 16:42:45 2025 (r24421) +++ branches/OpenMPT-1.32/include/asiomodern/OpenMPT.txt Mon Nov 10 16:43:10 2025 (r24422) @@ -1 +1 @@ -ASIO::Modern v0.12.10 +ASIO::Modern v0.12.11 Modified: branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOVersion.hpp ============================================================================== --- branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOVersion.hpp Mon Nov 10 16:42:45 2025 (r24421) +++ branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOVersion.hpp Mon Nov 10 16:43:10 2025 (r24422) @@ -17,7 +17,7 @@ #define ASIO_MODERNSDK_VERSION_MAJOR 0 #define ASIO_MODERNSDK_VERSION_MINOR 12 -#define ASIO_MODERNSDK_VERSION_PATCH 10 +#define ASIO_MODERNSDK_VERSION_PATCH 11 #define ASIO_MODERNSDK_VERSION_BUILD 0 Modified: branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp ============================================================================== --- branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp Mon Nov 10 16:42:45 2025 (r24421) +++ branches/OpenMPT-1.32/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp Mon Nov 10 16:43:10 2025 (r24422) @@ -26,7 +26,7 @@ inline namespace ASIO_VERSION_NAMESPACE { namespace stdcxx20 { template <class To, class From> -typename inline std::enable_if<(sizeof(To) == sizeof(From)) && std::is_trivially_copyable<From>::value && std::is_trivial<To>::value, To>::type bit_cast(const From & src) noexcept { +typename inline std::enable_if<(sizeof(To) == sizeof(From)) && std::is_trivially_copyable<From>::value && std::is_trivially_copyable<To>::value, To>::type bit_cast(const From & src) noexcept { To dst; std::memcpy(&dst, &src, sizeof(To)); return dst; |