Disable bitwise operation warning in more files

dune/common/debugalign.hh

@@ -182,12 +182,19 @@ namespace Dune {
 #if __GNUC__ >= 7
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wbool-operation"
+#endif
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wbool-operation"
 #endif
       template<class U = T,
                class = std::void_t<decltype(~std::declval<const U&>())> >
       decltype(auto) operator~() const { return aligned<align>(~value_); }
 #if __GNUC__ >= 7
 #  pragma GCC diagnostic pop
+#endif
+#ifdef __clang__
+#  pragma clang diagnostic pop
 #endif
 
       template<class U = T,

dune/common/simd/loop.hh

@@ -30,13 +30,12 @@ namespace Dune {
  * a bool (when instantiated for T=bool)
  */
 #ifdef __clang__
+#if __has_warning("-Wbitwise-instead-of-logical")
 #  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wbool-operation"
-#  if __has_warning("-Wbitwise-instead-of-logical")
-#    pragma clang diagnostic ignored "-Wbitwise-instead-of-logical"
-#  endif
+#  pragma clang diagnostic ignored "-Wbitwise-instead-of-logical"
 #  define CLANG_WARNING_DISABLED
 #endif
+#endif
 
 /*
  * Introduce a simd pragma if OpenMP is available in standard version >= 4

dune/common/test/arithmetictestsuite.hh

@@ -20,6 +20,17 @@ namespace Dune {
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wbool-operation"
 #  pragma GCC diagnostic ignored "-Wint-in-bool-context"
+#  define GCC_WARNING_DISABLED
+#endif
+
+/*
+ * silence warnings from Clang about using bitwise operands on
+ * a bool (when instantiated for T=bool)
+ */
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wbool-operation"
+#  define CLANG_WARNING_DISABLED
 #endif
 
   //! Test suite for arithmetic types
@@ -791,8 +802,14 @@ namespace Dune {
     }
   };
 
-#if __GNUC__ >= 7
+#ifdef CLANG_WARNING_DISABLED
+#  pragma clang diagnostic pop
+#  undef CLANG_WARNING_DISABLED
+#endif
+
+#ifdef GCC_WARNING_DISABLED
 #  pragma GCC diagnostic pop
+#  undef GCC_WARNING_DISABLED
 #endif
 
 } // namespace Dune