Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct warning option for older gcc in wxLog test

Browse Source 
-Wdangling-else is only available since gcc 7.
This commit is contained in:
Vadim Zeitlin
2020-03-10 02:41:37 +01:00
parent 71ed744c76
commit ab9115e0a0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/log/logtest.cpp
View File

@@ -398,7 +398,13 @@ void LogTestCase::NoWarnings()
// any test, and their purpose is merely to guarantee that the wx(V)LogXXX // any test, and their purpose is merely to guarantee that the wx(V)LogXXX
// macros compile without 'dangling else' warnings. // macros compile without 'dangling else' warnings.
#if defined(__clang__) || wxCHECK_GCC_VERSION(4, 6) #if defined(__clang__) || wxCHECK_GCC_VERSION(4, 6)
#pragma GCC diagnostic error "-Wdangling-else" // gcc 7 split -Wdangling-else from the much older -Wparentheses, so use
// the new warning if it's available or the old one otherwise.
#if wxCHECK_GCC_VERSION(7, 0)
#pragma GCC diagnostic error "-Wdangling-else"
#else
#pragma GCC diagnostic error "-Wparentheses"
#endif
#endif #endif
static void v(int x, ...) static void v(int x, ...)