[lmi-commits] [lmi] master 85ca908 1/3: Suppress gcc 7 warnings in Boost.Regex in the header too

[Greg Chicares]

branch: master
commit 85ca9086890759269cfeb2125bcfc58ebc85f840
Author: Vadim Zeitlin <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Suppress gcc 7 warnings in Boost.Regex in the header too
    
    Instead of doing it at the makefile level, just suppress the new
    warnings given by gcc 7 in Boost headers in the same way as it was
    already done for -Wshadow.
---
 boost_regex.hpp | 4 ++++
 workhorse.make  | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/boost_regex.hpp b/boost_regex.hpp
index e4afa71..3cc454c 100644
--- a/boost_regex.hpp
+++ b/boost_regex.hpp
@@ -26,6 +26,10 @@
 
 #if defined __GNUC__
 #   pragma GCC diagnostic push
+#   if 7 <= __GNUC__
+#       pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#       pragma GCC diagnostic ignored "-Wregister"
+#   endif // 7 <= __GNUC__
 #   pragma GCC diagnostic ignored "-Wshadow"
 #endif // defined __GNUC__
 #include <boost/regex.hpp>
diff --git a/workhorse.make b/workhorse.make
index 2ba7465..cdde1c1 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -497,8 +497,6 @@ boost_dependent_objects := \
   regex_test.o \
   test_coding_rules.o \
 
-$(boost_dependent_objects): gcc_common_extra_warnings += 
-Wno-implicit-fallthrough
-$(boost_dependent_objects): gcc_common_extra_warnings += -Wno-register
 $(boost_dependent_objects): gcc_common_extra_warnings += 
-Wno-unused-local-typedefs
 
 # The boost regex library improperly defines "NOMINMAX":