incorporating upstream changes of submodules

This commit is contained in:
Cheng 2023-02-27 13:09:20 +08:00
parent 61db535769
commit ce010ab1fd
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
4 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 8cbcc3ccccb035b1a976c053ab4de47b7f0b9352 Subproject commit bc41d89b684b0068124753aba7188a3c730101cf

2
mpir

@ -1 +1 @@
Subproject commit c7f9435392ede4c7f2c887a44d7a9ca7d724f4dc Subproject commit bc42eee0b5d04b508b196231165a567db9f8f4b6

View File

@ -62,7 +62,7 @@ constexpr bool b_WINDOWS = false;
static_assert(wxUSE_UNSAFE_WXSTRING_CONV == 1, static_assert(wxUSE_UNSAFE_WXSTRING_CONV == 1,
R"(In fully utf environment, (wallet.manifest plus R"(In fully utf environment, (wallet.manifest plus
/utf-8 compile option) all string conversions are safe.)"); /utf-8 compile option) all string conversions are safe.)");
static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 0 && wxSUBRELEASE_NUMBER == 1, "expecting wxWidgets 3.1.7"); static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 2 && wxSUBRELEASE_NUMBER == 1, "expecting wxWidgets 3.2.2.1");
static_assert(wxUSE_IPV6 == 1, "IP6 unavailable in wxWidgets"); static_assert(wxUSE_IPV6 == 1, "IP6 unavailable in wxWidgets");
static_assert(WXWIN_COMPATIBILITY_3_0 == 0, "wxWidgets api out of date"); static_assert(WXWIN_COMPATIBILITY_3_0 == 0, "wxWidgets api out of date");
static_assert(wxUSE_COMPILER_TLS == (b_WINDOWS ? 2 : 1), "out of date workarounds in wxWidgets for windows bugs"); static_assert(wxUSE_COMPILER_TLS == (b_WINDOWS ? 2 : 1), "out of date workarounds in wxWidgets for windows bugs");

@ -1 +1 @@
Subproject commit 2648eb4da156a751a377cfe96b91faa03e535c10 Subproject commit 02e885c6f079c6e12a632f92cd7cfcceecf0c39b