[lmi-commits] [lmi] master 371ae7b 2/2: Suppress a gcc-10.0.0 warning for wx

[Greg Chicares]

branch: master
commit 371ae7b17bd0d03b76f9ecb03bae077126fd563b
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Suppress a gcc-10.0.0 warning for wx
    
    The only line affected is 'testing.h:55':
      (dlg ? typeid(*dlg) : typeid(T)).name());
---
 pchfile_wx.hpp | 4 +++-
 workhorse.make | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pchfile_wx.hpp b/pchfile_wx.hpp
index a6d9391..4876d67 100644
--- a/pchfile_wx.hpp
+++ b/pchfile_wx.hpp
@@ -42,8 +42,10 @@
 #   if 9 <= __GNUC__
 #       pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #   endif // 9 <= __GNUC__
-//  only 'strvararg.h:1048:19':
+//  "-Wdouble-promotion": only 'strvararg.h:1048:19':
 #   pragma GCC diagnostic ignored "-Wdouble-promotion"
+//  "-Wduplicated-branches": only 'testing.h:55:38':
+#   pragma GCC diagnostic ignored "-Wduplicated-branches"
 #   pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #   pragma GCC diagnostic ignored "-Wnoexcept"
 #   pragma GCC diagnostic ignored "-Wsign-conversion"
diff --git a/workhorse.make b/workhorse.make
index 675064b..a6df8f9 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -550,6 +550,7 @@ $(wx_dependent_objects): gcc_common_extra_warnings += \
   -Wno-cast-qual \
   -Wno-deprecated-copy \
   -Wno-double-promotion \
+  -Wno-duplicated-branches \
   -Wno-format-nonliteral \
   -Wno-noexcept \
   -Wno-sign-conversion \