diff --git a/dune/stuff/common/disable_warnings.hh b/dune/stuff/common/disable_warnings.hh
index 2b07d4e072e222810dbbfe9fe67187454a979ab1..86f27ca4409d0fd8a08e350f138b223c625d4aba 100644
--- a/dune/stuff/common/disable_warnings.hh
+++ b/dune/stuff/common/disable_warnings.hh
@@ -3,7 +3,10 @@
 // Copyright holders: Rene Milk, Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifdef __GNUC__
+#include <boost/config.hpp>
+
+#if BOOST_CLANG
+#error "foobar"
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wdeprecated-register"
@@ -16,4 +19,15 @@
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #pragma GCC diagnostic ignored "-Wused-but-marked-unused"
 #pragma GCC diagnostic ignored "-Wlogical-not-parentheses"
+#elif BOOST_GCC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wextra"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wreorder"
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif