]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Add another warning to DEAL_II_DISABLE_EXTRA_DIAGNOSTICS 5148/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 25 Sep 2017 21:43:50 +0000 (16:43 -0500)
committerMatthias Maier <tamiko@43-1.org>
Mon, 25 Sep 2017 21:43:50 +0000 (16:43 -0500)
include/deal.II/base/config.h.in
source/grid/grid_in.cc

index 22ddfefa5597e95a38960e4f0c76753bdf400f75..87856535802b2853f5e3fb55db87beb357f08324 100644 (file)
 
 #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
index 3baac76adb0d9bc0ac000fee6e3d5d13e3292314..80b58f2416dabba0de145d60a72a45f01f823bb6 100644 (file)
 
 #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
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.