Disable one more ICC warning.

git-svn-id: https://svn.dealii.org/trunk@28354 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index a5e553a87184599e44c5db859650053453691b86..d8125f52be6120c4eea892ca222cf2802e44d062 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -772,6 +772,9 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           dnl       #warning at one place)
           dnl #175: `subscript out of range' (doesn't take into account that
           dnl       some code is only reachable for some dimensions)
+         dnl #279: `controlling expression is constant' (this happens
+         dnl       in assertions placed into dead code branches such as
+         dnl       "Assert (false, ...)"
           dnl #327: `NULL reference is not allowed' (this happens when we
           dnl       write "*static_cast<double*>(0)" or some such thing,
           dnl       which we do to create invalid references)
@@ -787,8 +790,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           dnl #1565: attributes are ignored on a class declaration that is not
          dnl        also a definition (this happens in BOOST in a number of
          dnl        places)
-          CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -wd1565"
-          CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11"
+          CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd279 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -wd1565"
+          CXXFLAGSO="$CXXFLAGSO -w0 -wd175 -wd424 -wd11"
 
           dnl To reduce output, use -opt_report_levelmin where possible,
           dnl i.e. post icc5. from icc10 onwards, this flag is called

diff --git a/deal.II/configure b/deal.II/configure
index d82df097184b9ada4a547d7c162c0dc367b8104b..8963097594920350ac2c30b928f645e781d5034f 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -4919,8 +4919,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
               ;;
           esac
 
-                                                                                                                                                                                                                   CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -wd1565"
-          CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11"
+                                                                                                                                                                                                                                           CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd279 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -wd1565"
+          CXXFLAGSO="$CXXFLAGSO -w0 -wd175 -wd424 -wd11"
 
                                                                                                     case "$GXX_VERSION" in
             intel_icc5)