Remove checks for gcc <= 4.8 and always assume it's 4.8+
Previous versions don't provide C++11 support which is required now anyhow and so can't be used any longer.
This commit is contained in:
Vadim Zeitlin
parent
1e26cbfcaf
commit
23a57b981f
8 changed files with 15 additions and 52 deletions
|
|
@ -18,7 +18,7 @@
|
|||
#define CHECK_GCC_VERSION(major, minor) 0
|
||||
#endif
|
||||
|
||||
#if CHECK_GCC_VERSION(4, 6) || defined(__clang__)
|
||||
#if defined(__GNUC__) || defined(__clang__)
|
||||
// As above, we can't reuse wxCONCAT() and wxSTRINGIZE macros from wx/cpp.h
|
||||
// here, so define their equivalents here.
|
||||
#define CONCAT_HELPER(x, y) x ## y
|
||||
|
|
@ -32,12 +32,13 @@
|
|||
#define WARNING_TURN_OFF(comp, warn) \
|
||||
_Pragma(STRINGIZE(comp diagnostic ignored STRINGIZE(CONCAT(-W,warn))))
|
||||
|
||||
#if CHECK_GCC_VERSION(4, 6)
|
||||
#define GCC_TURN_ON(warn) WARNING_TURN_ON(GCC, warn)
|
||||
#define GCC_TURN_OFF(warn) WARNING_TURN_OFF(GCC, warn)
|
||||
#elif defined(__clang__)
|
||||
// Test for clang before gcc as clang defines __GNUC__ too.
|
||||
#if defined(__clang__)
|
||||
#define CLANG_TURN_ON(warn) WARNING_TURN_ON(clang, warn)
|
||||
#define CLANG_TURN_OFF(warn) WARNING_TURN_OFF(clang, warn)
|
||||
#elif defined(__GNUC__)
|
||||
#define GCC_TURN_ON(warn) WARNING_TURN_ON(GCC, warn)
|
||||
#define GCC_TURN_OFF(warn) WARNING_TURN_OFF(GCC, warn)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -83,9 +84,7 @@
|
|||
#if CHECK_GCC_VERSION(6,1)
|
||||
GCC_TURN_ON(abi)
|
||||
#endif // 6.1
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_ON(abi-tag)
|
||||
#endif // 4.8
|
||||
GCC_TURN_ON(address)
|
||||
GCC_TURN_ON(aggregate-return)
|
||||
#if CHECK_GCC_VERSION(7,1)
|
||||
|
|
@ -124,9 +123,7 @@
|
|||
#if CHECK_GCC_VERSION(4,9)
|
||||
GCC_TURN_ON(date-time)
|
||||
#endif // 4.9
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(delete-non-virtual-dtor)
|
||||
#endif // 4.7
|
||||
#if CHECK_GCC_VERSION(9,1)
|
||||
GCC_TURN_ON(deprecated-copy)
|
||||
#endif // 9.1
|
||||
|
|
@ -156,24 +153,18 @@
|
|||
#if CHECK_GCC_VERSION(5,1)
|
||||
GCC_TURN_ON(format-signedness)
|
||||
#endif // 5.1
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(format-zero-length)
|
||||
#endif // 4.7
|
||||
GCC_TURN_ON(ignored-qualifiers)
|
||||
GCC_TURN_ON(init-self)
|
||||
GCC_TURN_ON(inline)
|
||||
GCC_TURN_ON(invalid-pch)
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_ON(literal-suffix)
|
||||
#endif // 4.8
|
||||
#if CHECK_GCC_VERSION(6,1)
|
||||
GCC_TURN_ON(logical-op)
|
||||
#endif // 6.1
|
||||
GCC_TURN_ON(long-long)
|
||||
GCC_TURN_ON(main)
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(maybe-uninitialized)
|
||||
#endif // 4.7
|
||||
#if CHECK_GCC_VERSION(10,1)
|
||||
GCC_TURN_ON(mismatched-tags)
|
||||
#endif // 10.1
|
||||
|
|
@ -187,17 +178,13 @@
|
|||
#if CHECK_GCC_VERSION(6,1)
|
||||
GCC_TURN_ON(namespaces)
|
||||
#endif // 6.1
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(narrowing)
|
||||
#endif // 4.7
|
||||
GCC_TURN_ON(noexcept)
|
||||
#if CHECK_GCC_VERSION(7,1)
|
||||
GCC_TURN_ON(noexcept-type)
|
||||
#endif // 7.1
|
||||
GCC_TURN_ON(non-virtual-dtor)
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(nonnull)
|
||||
#endif // 4.7
|
||||
#if CHECK_GCC_VERSION(6,1)
|
||||
GCC_TURN_ON(null-dereference)
|
||||
#endif // 6.1
|
||||
|
|
@ -246,9 +233,7 @@
|
|||
GCC_TURN_ON(suggest-attribute=cold)
|
||||
#endif // 8.1
|
||||
GCC_TURN_ON(suggest-attribute=const)
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_ON(suggest-attribute=format)
|
||||
#endif // 4.8
|
||||
#if CHECK_GCC_VERSION(8,1)
|
||||
GCC_TURN_ON(suggest-attribute=malloc)
|
||||
#endif // 8.1
|
||||
|
|
@ -283,20 +268,14 @@
|
|||
GCC_TURN_ON(unused-but-set-variable)
|
||||
GCC_TURN_ON(unused-function)
|
||||
GCC_TURN_ON(unused-label)
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(unused-local-typedefs)
|
||||
#endif // 4.7
|
||||
GCC_TURN_ON(unused-macros)
|
||||
GCC_TURN_ON(unused-parameter)
|
||||
GCC_TURN_ON(unused-value)
|
||||
GCC_TURN_ON(unused-variable)
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_ON(useless-cast)
|
||||
#endif // 4.8
|
||||
GCC_TURN_ON(variadic-macros)
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(vector-operation-performance)
|
||||
#endif // 4.7
|
||||
#if CHECK_GCC_VERSION(6,1)
|
||||
GCC_TURN_ON(virtual-inheritance)
|
||||
#endif // 6.1
|
||||
|
|
@ -306,9 +285,7 @@
|
|||
#endif // 10.1
|
||||
GCC_TURN_ON(volatile-register-var)
|
||||
GCC_TURN_ON(write-strings)
|
||||
#if CHECK_GCC_VERSION(4,7)
|
||||
GCC_TURN_ON(zero-as-null-pointer-constant)
|
||||
#endif // 4.7
|
||||
// }}}
|
||||
|
||||
#undef GCC_TURN_ON
|
||||
|
|
@ -324,9 +301,7 @@
|
|||
GCC_TURN_OFF(sign-conversion)
|
||||
|
||||
GCC_TURN_OFF(old-style-cast)
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_OFF(useless-cast)
|
||||
#endif // 4.8
|
||||
|
||||
#if CHECK_GCC_VERSION(10,1)
|
||||
GCC_TURN_OFF(redundant-tags) // "struct tm" triggers this
|
||||
|
|
@ -334,7 +309,7 @@
|
|||
|
||||
// This one is given for NULL, and not just literal 0, up to gcc 10, and so
|
||||
// has to remain disabled for as long as we use any NULLs in our code.
|
||||
#if CHECK_GCC_VERSION(4,7) && !CHECK_GCC_VERSION(10,1)
|
||||
#if !CHECK_GCC_VERSION(10,1)
|
||||
GCC_TURN_OFF(zero-as-null-pointer-constant)
|
||||
#endif
|
||||
|
||||
|
|
@ -356,9 +331,7 @@
|
|||
|
||||
// This one is given whenever inheriting from std:: classes without using
|
||||
// C++11 ABI tag explicitly, probably harmless.
|
||||
#if CHECK_GCC_VERSION(4,8)
|
||||
GCC_TURN_OFF(abi-tag)
|
||||
#endif // 4.8
|
||||
|
||||
// This can be used to ask the compiler to explain why some function is not
|
||||
// inlined, but it's perfectly normal for some functions not to be inlined.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue