[OMPT-svn-commit] OpenMPT r23138 - in branches/OpenMPT-1.32: . src/mpt/json

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

Author: manx
Date: Fri Apr 18 11:20:18 2025
New Revision: 23138
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23138

Log:
Merged revision(s) 23133 from trunk/OpenMPT:
[Ref] mpt/json/json.hpp: std::optional support is in nlohmann-json 3.12.0, but it is broken without <https://github.com/nlohmann/json/pull/4742>. Enable support only for >= 3.12.1.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/mpt/json/json.hpp

Modified: branches/OpenMPT-1.32/src/mpt/json/json.hpp
==============================================================================
--- branches/OpenMPT-1.32/src/mpt/json/json.hpp	Fri Apr 18 11:18:26 2025	(r23137)
+++ branches/OpenMPT-1.32/src/mpt/json/json.hpp	Fri Apr 18 11:20:18 2025	(r23138)
@@ -22,16 +22,11 @@
 #endif // MPT_COMPILER_MSVC
 #endif // MPT_DETECTED_NLOHMANN_JSON
 
-#if 0
-// The precise version when std::optional support will be included is still unknown.
 #if NLOHMANN_JSON_VERSION_MAJOR < 3
 #define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL
-#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR < 11)
+#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR < 12)
 #define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL
-#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 11) && (NLOHMANN_JSON_VERSION_PATCH < 4)
-#define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL
-#endif
-#else
+#elif (NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 12) && (NLOHMANN_JSON_VERSION_PATCH < 1)
 #define MPT_JSON_JSON_NLOHMANN_JSON_QUIRK_NO_STD_OPTIONAL
 #endif