[OMPT-svn-commit] OpenMPT r21330 - in branches/OpenMPT-1.31: . include/asiomodern include/asiomodern/include/ASIOModern

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

Author: manx
Date: Mon Aug  5 15:00:32 2024
New Revision: 21330
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21330

Log:
Merged revision(s) 21327 from trunk/OpenMPT:
[Var] ASIO::Modern: Update to v0.12.9
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/asiomodern/OpenMPT.txt
   branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOConfig.hpp
   branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOVersion.hpp
   branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp

Modified: branches/OpenMPT-1.31/include/asiomodern/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/asiomodern/OpenMPT.txt	Mon Aug  5 14:52:35 2024	(r21329)
+++ branches/OpenMPT-1.31/include/asiomodern/OpenMPT.txt	Mon Aug  5 15:00:32 2024	(r21330)
@@ -1 +1 @@
-ASIO::Modern v0.12.8
+ASIO::Modern v0.12.9

Modified: branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOConfig.hpp
==============================================================================
--- branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOConfig.hpp	Mon Aug  5 14:52:35 2024	(r21329)
+++ branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOConfig.hpp	Mon Aug  5 15:00:32 2024	(r21330)
@@ -46,6 +46,17 @@
 #endif
 
 
+#if ASIO_COMPILER_MSVC
+#if defined(_MSVC_LANG)
+#define ASIO_CXX_VERSION _MSVC_LANG
+#else
+#define ASIO_CXX_VERSION __cplusplus
+#endif
+#else
+#define ASIO_CXX_VERSION __cplusplus
+#endif
+
+
 #if ASIO_COMPILER_MSVC || ASIO_COMPILER_CLANG || ASIO_COMPILER_GCC || ASIO_SYSTEM_WINDOWS
 // assume #pragma pack support on Windows
 #define ASIO_HAVE_PRAGMA_PACK 1

Modified: branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOVersion.hpp
==============================================================================
--- branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOVersion.hpp	Mon Aug  5 14:52:35 2024	(r21329)
+++ branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOVersion.hpp	Mon Aug  5 15:00:32 2024	(r21330)
@@ -17,7 +17,7 @@
 
 #define ASIO_MODERNSDK_VERSION_MAJOR 0
 #define ASIO_MODERNSDK_VERSION_MINOR 12
-#define ASIO_MODERNSDK_VERSION_PATCH 8
+#define ASIO_MODERNSDK_VERSION_PATCH 9
 #define ASIO_MODERNSDK_VERSION_BUILD 0
 
 

Modified: branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp
==============================================================================
--- branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp	Mon Aug  5 14:52:35 2024	(r21329)
+++ branches/OpenMPT-1.31/include/asiomodern/include/ASIOModern/ASIOstdcxx20bit.hpp	Mon Aug  5 15:00:32 2024	(r21330)
@@ -9,7 +9,7 @@
 
 
 
-#if (__cplusplus > 202000L)
+#if (ASIO_CXX_VERSION >= 202002L)
 #include <bit>
 namespace ASIO {
 inline namespace ASIO_VERSION_NAMESPACE {