From 088e56e6b8ccfdbef25e5a82556eff31327cefa1 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 23 Nov 2004 05:14:10 +0000 Subject: [PATCH] Only add -wd1572 conditionally. git-svn-id: https://svn.dealii.org/trunk@9804 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 6f14a5e1e2..e179a0e3bb 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -458,13 +458,7 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl (valid, but annoying and sometimes hard to work around) dnl #858: `type qualifier on return type is meaningless' dnl (on conversion operators to types that are already const) - dnl #1572: `floating-point equality and inequality comparisons are - dnl unreliable' - dnl (while true, this warning also triggers on comparisons - dnl with zero, or comparing two variables for which one is - dnl greater; there is about no way to write numeric code - dnl without triggering this warning many times over) - CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd1572 -wd734 -wd858 -DDEBUG -inline_debug_info" + CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -DDEBUG -inline_debug_info" CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -unroll -w0 -wd424 -wd11" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC" @@ -475,6 +469,18 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" fi + dnl For icc 7 and above, add this warning inhibition flag: + dnl #1572: `floating-point equality and inequality comparisons are + dnl unreliable' + dnl (while true, this warning also triggers on comparisons + dnl with zero, or comparing two variables for which one is + dnl greater; there is about no way to write numeric code + dnl without triggering this warning many times over) + if test "x$GXX_VERSION" != "xintel_icc5" \ + -a "x$GXX_VERSION" != "xintel_icc6"; then + CXXFLAGSG="$CXXFLAGSG -wd1572" + fi + dnl We would really like to use -ansi -Xc, since that dnl is _very_ picky about standard C++, and is thus very efficient dnl in detecting slight standard violations, but these flags are -- 2.39.5