mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
tb
761d3b856c
One test breaks because OpenBSD doesn't support LC_NUMERIC. Pull in an upstream fix for incorrect char8_t support with C++20 to unbreak the build of games/openrtc2 https://github.com/nlohmann/json/releases/tag/v3.11.3 https://github.com/nlohmann/json/releases/tag/v3.12.0 https://github.com/nlohmann/json/pull/4736
19 lines
736 B
Plaintext
19 lines
736 B
Plaintext
https://github.com/nlohmann/json/pull/4736/commits/34868f90149de02432ea758a29227a6ad74f098c
|
|
|
|
Index: tests/src/unit-deserialization.cpp
|
|
--- tests/src/unit-deserialization.cpp.orig
|
|
+++ tests/src/unit-deserialization.cpp
|
|
@@ -1134,9 +1134,10 @@ TEST_CASE("deserialization")
|
|
}
|
|
}
|
|
|
|
-// select the types to test - char8_t is only available in C++20
|
|
+// select the types to test - char8_t is only available since C++20 if and only
|
|
+// if __cpp_char8_t is defined.
|
|
#define TYPE_LIST(...) __VA_ARGS__
|
|
-#ifdef JSON_HAS_CPP_20
|
|
+#if defined(__cpp_char8_t) && (__cpp_char8_t >= 201811L)
|
|
#define ASCII_TYPES TYPE_LIST(char, wchar_t, char16_t, char32_t, char8_t)
|
|
#else
|
|
#define ASCII_TYPES TYPE_LIST(char, wchar_t, char16_t, char32_t)
|