From: Carl Hetherington <cth@carlh.net>
Date: Thu, 21 Apr 2022 21:19:27 +0000 (+0200)
Subject: Revert "Adjust handling of -Wsuggest-override"
X-Git-Tag: v2.16.10~49
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7e6ac6046293cb85d4ee2bdc1fba9b3750712723

Revert "Adjust handling of -Wsuggest-override"

This reverts commit e7e4af869f7144fa9a265ccf1e15c7b2f182ac2c.

I misunderstood what was going on, and we were just missing some
DCPOMATIC_{DIS,EN}ABLE_WARNINGS calls.
---

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'])