From: Matthias Maier <tamiko@43-1.org>
Date: Mon, 25 Sep 2017 21:43:50 +0000 (-0500)
Subject: Add another warning to DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
X-Git-Tag: v9.0.0-rc1~1025^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339f27f7b3b27d40f9bb76b74c86a737ad2e3379;p=dealii.git

Add another warning to DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
---

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 22ddfefa55..8785653580 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -277,40 +277,42 @@
 
 #ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA
 
-#  define DEAL_II_DISABLE_EXTRA_DIAGNOSTICS                      \
-_Pragma("GCC diagnostic push")                                   \
-_Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")          \
-_Pragma("GCC diagnostic ignored \"-Wpragmas\"")                  \
-_Pragma("GCC diagnostic ignored \"-Wunknown-warning-option\"")   \
-_Pragma("GCC diagnostic ignored \"-Wunknown-warning\"")          \
-_Pragma("GCC diagnostic ignored \"-Wextra\"")                    \
-_Pragma("GCC diagnostic ignored \"-Woverloaded-virtual\"")       \
-_Pragma("GCC diagnostic ignored \"-Wunused-function\"")          \
-_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")         \
-_Pragma("GCC diagnostic ignored \"-Wunused-variable\"")          \
-_Pragma("GCC diagnostic ignored \"-Wtype-limits\"")              \
+/* keep pragmas with an exclamation mark in order.. */
+#  define DEAL_II_DISABLE_EXTRA_DIAGNOSTICS                             \
+_Pragma("GCC diagnostic push")                                    /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")           /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Wpragmas\"")                   /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Wunknown-warning-option\"")    /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Wunknown-warning\"")           /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Wextra\"")                     /*!*/ \
+_Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")        \
+_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")         \
+_Pragma("GCC diagnostic ignored \"-Wexpansion-to-defined\"")            \
+_Pragma("GCC diagnostic ignored \"-Wexpansion-to-defined\"")            \
+_Pragma("GCC diagnostic ignored \"-Wignored-attributes\"")              \
+_Pragma("GCC diagnostic ignored \"-Wignored-qualifiers\"")              \
+_Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")            \
+_Pragma("GCC diagnostic ignored \"-Winfinite-recursion\"")              \
+_Pragma("GCC diagnostic ignored \"-Wint-in-bool-context\"")             \
+_Pragma("GCC diagnostic ignored \"-Wmisleading-indentation\"")          \
+_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"")      \
+_Pragma("GCC diagnostic ignored \"-Wnested-anon-types\"")               \
+_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")                \
+_Pragma("GCC diagnostic ignored \"-Woverflow\"")                        \
+_Pragma("GCC diagnostic ignored \"-Woverloaded-virtual\"")              \
+_Pragma("GCC diagnostic ignored \"-Wpedantic\"")                        \
 _Pragma("GCC diagnostic ignored \"-Wtautological-constant-out-of-range-compare\"") \
-_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
-_Pragma("GCC diagnostic ignored \"-Winfinite-recursion\"")       \
-_Pragma("GCC diagnostic ignored \"-Wunused-but-set-parameter\"") \
-_Pragma("GCC diagnostic ignored \"-Wnested-anon-types\"")        \
-_Pragma("GCC diagnostic ignored \"-Wunused-private-field\"")     \
-_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")  \
-_Pragma("GCC diagnostic ignored \"-Wunused-but-set-variable\"")  \
-_Pragma("GCC diagnostic ignored \"-Wexpansion-to-defined\"")     \
-_Pragma("GCC diagnostic ignored \"-Wignored-attributes\"")       \
-_Pragma("GCC diagnostic ignored \"-Wmisleading-indentation\"")   \
-_Pragma("GCC diagnostic ignored \"-Wundef\"")                    \
-_Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")         \
-_Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")     \
-_Pragma("GCC diagnostic ignored \"-Wint-in-bool-context\"")      \
-_Pragma("GCC diagnostic ignored \"-Wexpansion-to-defined\"")     \
-_Pragma("GCC diagnostic ignored \"-Wignored-qualifiers\"")       \
-_Pragma("GCC diagnostic ignored \"-Woverflow\"")                 \
-_Pragma("GCC diagnostic ignored \"-Wpedantic\"")                 \
-_Pragma("GCC diagnostic warning \"-Wpragmas\"")
-
-#  define DEAL_II_ENABLE_EXTRA_DIAGNOSTICS                       \
+_Pragma("GCC diagnostic ignored \"-Wtype-limits\"")                     \
+_Pragma("GCC diagnostic ignored \"-Wundef\"")                           \
+_Pragma("GCC diagnostic ignored \"-Wunused-but-set-parameter\"")        \
+_Pragma("GCC diagnostic ignored \"-Wunused-but-set-variable\"")         \
+_Pragma("GCC diagnostic ignored \"-Wunused-function\"")                 \
+_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")                \
+_Pragma("GCC diagnostic ignored \"-Wunused-private-field\"")            \
+_Pragma("GCC diagnostic ignored \"-Wunused-variable\"")                 \
+_Pragma("GCC diagnostic warning \"-Wpragmas\"")                   /*!*/
+
+#  define DEAL_II_ENABLE_EXTRA_DIAGNOSTICS                              \
 _Pragma("GCC diagnostic pop")
 
 #else
diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 3baac76adb..80b58f2416 100644
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -36,12 +36,9 @@
 
 #ifdef DEAL_II_WITH_ASSIMP
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
 #include <assimp/Importer.hpp>      // C++ importer interface
 #include <assimp/scene.h>           // Output data structure
 #include <assimp/postprocess.h>     // Post processing flags
-#pragma GCC diagnostic pop
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif