diff --git a/src/Version.h b/src/Version.h index 7f41d41fe..a387bf98a 100644 --- a/src/Version.h +++ b/src/Version.h @@ -86,7 +86,12 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build) if (build >= 22000) { // Win11 - if (build >= 22621) { + if (build >= 22631) + { + lpcReleaseID = L"23H2"; + } + else if (build >= 22621) + { lpcReleaseID = L"22H2"; } else { @@ -225,8 +230,10 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build) #define VER_CPL MS Visual C++ 2022 v17.0.(0-1) #endif #elif (_MSC_VER == 1929) - #if (_MSC_FULL_VER >= 192930152) - #define VER_CPL MS Visual C++ 2019 v16.11.30 + #if (_MSC_FULL_VER >= 192930153) + #define VER_CPL MS Visual C++ 2019 v16.11.33 + #elif (_MSC_FULL_VER >= 192930152) + #define VER_CPL MS Visual C++ 2019 v16.11.(30-32) #elif (_MSC_FULL_VER >= 192930151) #define VER_CPL MS Visual C++ 2019 v16.11.29 #elif (_MSC_FULL_VER >= 192930150) diff --git a/src/tinyexpr/tinyexpr.h b/src/tinyexpr/tinyexpr.h index 6529b91e9..867f14b48 100644 --- a/src/tinyexpr/tinyexpr.h +++ b/src/tinyexpr/tinyexpr.h @@ -48,7 +48,10 @@ extern "C" { #define TE_INT_FMT "%i" #endif -typedef struct te_expr { +#pragma warning(push) +#pragma warning(disable:4201) + + typedef struct te_expr { int type; union {double value; const double * bound; const void * function;}; #if defined(TINYEXPR_USE_STATIC_MEMORY) @@ -58,6 +61,7 @@ typedef struct te_expr { #endif } te_expr; +#pragma warning(pop) enum { TE_VARIABLE = 0,