restrict static_assert to >= C++20 (except in MSVC where __cplusplus …

…isn't correctly set by default)
freeorion · Apr 20, 2024 · fcc1fd9 · fcc1fd9
1 parent d81c662
commit fcc1fd9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/GG/src/Font.cpp b/GG/src/Font.cpp
@@ -259,7 +259,9 @@ namespace {
     }();
     static_assert(std::string_view{three_zero.data()} == "30");
 
-#if defined(__cpp_lib_constexpr_string) && ((!defined(__GNUC__) || (__GNUC__ > 11))) && ((!defined(_MSC_VER) || (_MSC_VER >= 1934)))
+#if defined(__cpp_lib_constexpr_string) && \
+    (defined(_MSC_VER) || defined(__cplusplus) && (__cplusplus >= 202002L)) && \
+    (!defined(_MSC_VER) || (_MSC_VER >= 1934))
     static_assert([](){
         const std::string str{"a"};
         return str.size() >= 1 &&