summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/warnings.h3
-rw-r--r--wscript5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index c6c2f7e0c..ca8a9ab5e 100644
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -35,7 +35,8 @@
_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
_Pragma("GCC diagnostic ignored \"-Waddress\"") \
- _Pragma("GCC diagnostic ignored \"-Wparentheses\"")
+ _Pragma("GCC diagnostic ignored \"-Wparentheses\"") \
+ _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"")
#endif
#define DCPOMATIC_ENABLE_WARNINGS \
diff --git a/wscript b/wscript
index 994f1b6f3..4ccadf6fd 100644
--- a/wscript
+++ b/wscript
@@ -109,6 +109,7 @@ def configure(conf):
'-Wall',
'-Wextra',
'-Wwrite-strings',
+ '-Wsuggest-override',
'-Wno-error=deprecated',
# I tried and failed to ignore these with _Pragma
'-Wno-ignored-qualifiers',
@@ -126,10 +127,6 @@ def configure(conf):
if int(gcc[0]) >= 8:
# I tried and failed to ignore these with _Pragma
conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
- if int(gcc[0]) >= 9:
- # I can't get #pragma GCC diagnostic ignored "-Wsuggest-override" to work on older GCCs,
- # so only enable this if we're on a newer one
- conf.env.append_value('CXXFLAGS', '-Wsuggest-override')
have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
# Most gccs still give these warnings from boost::optional
conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])