From: bangerth Date: Tue, 3 Jul 2012 10:13:30 +0000 (+0000) Subject: Untabify. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96b596d586360378fd85b386e41508add368fb27;p=dealii-svn.git Untabify. git-svn-id: https://svn.dealii.org/trunk@25666 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 68b2e81386..3cfaa6a09f 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -171,31 +171,31 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl AC_MSG_RESULT(C++ compiler is unknown version but accepted MIPSpro compiler version) GXX_VERSION=MIPSpro-other GXX_VERSION_DETAILED="$GXX_VERSION" - ;; + ;; esac else dnl Intel's ICC C++ compiler? On Linux, it uses -V, on Windows - dnl it is -help + dnl it is -help is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel'`" is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel'`" - is_intel_icc="$is_intel_icc1$is_intel_icc2" + is_intel_icc="$is_intel_icc1$is_intel_icc2" - dnl When calling the Portland Group compiler, it also - dnl outputs the string 'Intel' in its help text, so make - dnl sure we're not confused - is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" + dnl When calling the Portland Group compiler, it also + dnl outputs the string 'Intel' in its help text, so make + dnl sure we're not confused + is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x" ; then - GXX_BRAND=Intel - version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" - version5="`echo $version_string | grep 'Version 5'`" - version6="`echo $version_string | grep 'Version 6'`" - version7="`echo $version_string | grep 'Version 7'`" - version8="`echo $version_string | grep 'Version 8'`" - version9="`echo $version_string | grep 'Version 9'`" - version10="`echo $version_string | grep 'Version 10'`" - version11="`echo $version_string | grep 'Version 11'`" + GXX_BRAND=Intel + version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" + version5="`echo $version_string | grep 'Version 5'`" + version6="`echo $version_string | grep 'Version 6'`" + version7="`echo $version_string | grep 'Version 7'`" + version8="`echo $version_string | grep 'Version 8'`" + version9="`echo $version_string | grep 'Version 9'`" + version10="`echo $version_string | grep 'Version 10'`" + version11="`echo $version_string | grep 'Version 11'`" if test "x$version5" != "x" ; then AC_MSG_RESULT(C++ compiler is icc-5) GXX_VERSION=intel_icc5 @@ -236,7 +236,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl Sun Workshop/Studio? + dnl Sun Workshop/Studio? is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" is_sun_cc_2="`($CXX -V 2>&1) | grep 'Sun C++'`" if test "x$is_sun_cc_1$is_sun_cc_2" != "x" ; then @@ -246,7 +246,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl Sun Forte? + dnl Sun Forte? is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" if test "x$is_sun_forte_cc" != "x" ; then AC_MSG_RESULT(C++ compiler is Sun Forte compiler) @@ -255,85 +255,85 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl Portland Group C++? - is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" - if test "x$is_pgcc" != "x" ; then - GXX_VERSION_STRING=`($CXX -V 2>&1) | grep "^pgCC"` + dnl Portland Group C++? + is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" + if test "x$is_pgcc" != "x" ; then + GXX_VERSION_STRING=`($CXX -V 2>&1) | grep "^pgCC"` full_version=`echo "$GXX_VERSION_STRING" | perl -pi -e 's/.*pgCC\s+(\S+).*/\1/g;'` - GXX_BRAND=PortlandGroup - GXX_VERSION=pgCC`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` - GXX_VERSION_DETAILED=pgCC"$full_version" - AC_MSG_RESULT(C++ compiler is Portland Group C++ $full_version) + GXX_BRAND=PortlandGroup + GXX_VERSION=pgCC`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + GXX_VERSION_DETAILED=pgCC"$full_version" + AC_MSG_RESULT(C++ compiler is Portland Group C++ $full_version) else - dnl HP aCC? - is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" - if test "x$is_aCC" != "x" ; then - AC_MSG_RESULT(C++ compiler is HP aCC) - GXX_BRAND=HP + dnl HP aCC? + is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" + if test "x$is_aCC" != "x" ; then + AC_MSG_RESULT(C++ compiler is HP aCC) + GXX_BRAND=HP GXX_VERSION=hp_aCC - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl Borland C++ - is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" - if test "x$is_bcc" != "x" ; then - AC_MSG_RESULT(C++ compiler is Borland C++) - GXX_BRAND=Borland - GXX_VERSION=borland_bcc - GXX_VERSION_DETAILED="$GXX_VERSION" + dnl Borland C++ + is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" + if test "x$is_bcc" != "x" ; then + AC_MSG_RESULT(C++ compiler is Borland C++) + GXX_BRAND=Borland + GXX_VERSION=borland_bcc + GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl KAI C++? It seems as if the documented options - dnl -V and --version are not always supported, so give - dnl the whole thing a second try by looking for /KCC/ - dnl somewhere in the paths that are output by -v. This - dnl is risky business, since this combination of - dnl characters might appear on other installations + dnl KAI C++? It seems as if the documented options + dnl -V and --version are not always supported, so give + dnl the whole thing a second try by looking for /KCC/ + dnl somewhere in the paths that are output by -v. This + dnl is risky business, since this combination of + dnl characters might appear on other installations dnl of other compilers as well, so put this test to dnl the very end of the detection chain for the dnl various compilers - is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" - is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" - if test "x$is_kai_cc" != "x" ; then - AC_MSG_RESULT(C++ compiler is KAI C++) - GXX_BRAND=KAI - GXX_VERSION=kai_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" + is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" + if test "x$is_kai_cc" != "x" ; then + AC_MSG_RESULT(C++ compiler is KAI C++) + GXX_BRAND=KAI + GXX_VERSION=kai_cc + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Maybe PathScale's compiler? is_pathscale="`($CXX -v 2>&1) | grep PathScale`" if test "x$is_pathscale" != "x" ; then AC_MSG_RESULT(C++ compiler is PathScale C++) - GXX_BRAND=PathScale - GXX_VERSION=pathscale_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_BRAND=PathScale + GXX_VERSION=pathscale_cc + GXX_VERSION_DETAILED="$GXX_VERSION" else dnl Maybe CLang? - is_clang="`($CXX --version 2>&1) | grep clang`" - if test "x$is_clang" != x ; then + is_clang="`($CXX --version 2>&1) | grep clang`" + if test "x$is_clang" != x ; then AC_MSG_RESULT(C++ compiler is clang) - GXX_BRAND=clang - GXX_VERSION=clang - GXX_VERSION_DETAILED="$GXX_VERSION" - else + GXX_BRAND=clang + GXX_VERSION=clang + GXX_VERSION_DETAILED="$GXX_VERSION" + else dnl Maybe Cray C++? - is_cray="`($CXX -V 2>&1) | grep Cray`" - if test "x$is_cray" != x ; then + is_cray="`($CXX -V 2>&1) | grep Cray`" + if test "x$is_cray" != x ; then AC_MSG_RESULT(C++ compiler is Cray C++) - GXX_BRAND=cray - GXX_VERSION=cray - GXX_VERSION_DETAILED="$GXX_VERSION" - else + GXX_BRAND=cray + GXX_VERSION=cray + GXX_VERSION_DETAILED="$GXX_VERSION" + else dnl Aw, nothing suitable found... AC_MSG_RESULT(Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org) GXX_BRAND=Unknown - GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED="$GXX_VERSION" fi fi fi @@ -342,7 +342,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl fi fi fi - fi + fi fi fi fi @@ -367,14 +367,14 @@ AC_DEFUN(DEAL_II_DETERMINE_IF_SUPPORTS_MPI, dnl #include ], [ - MPI_Init (0,0); - ], + MPI_Init (0,0); + ], [ AC_MSG_RESULT(yes) - AC_DEFINE(DEAL_II_COMPILER_SUPPORTS_MPI, 1, + AC_DEFINE(DEAL_II_COMPILER_SUPPORTS_MPI, 1, [Defined if the compiler supports including ]) - DEAL_II_COMPILER_SUPPORTS_MPI=1 + DEAL_II_COMPILER_SUPPORTS_MPI=1 DEAL_II_USE_MPI=yes ], [ @@ -496,22 +496,22 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl DEC OSF and linux on x86_64. case "$target" in *aix* ) - CXXFLAGSPIC= - LDFLAGSPIC= + CXXFLAGSPIC= + LDFLAGSPIC= LDFLAGS="$LDFLAGS -lpthread" - ;; + ;; *dec-osf* ) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" LDFLAGS="$LDFLAGS -lpthread" - ;; + ;; *x86_64*) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - LDFLAGS="$LDFLAGS -lpthread" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + LDFLAGS="$LDFLAGS -lpthread" + ;; *cygwin* ) dnl On Cygwin, when using shared libraries, there might occur @@ -521,16 +521,16 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl but of course this might lead to strange program behaviour if dnl you accidentally defined one symbol multiple times... dnl (added 2005/07/13, Ralf B. Schulz) - dnl (modified 2005/12/20, Ralf B. Schulz) + dnl (modified 2005/12/20, Ralf B. Schulz) CXXFLAGSPIC= - LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" + LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" SHLIBFLAGS="$SHLIBFLAGS -Xlinker --allow-multiple-definition" ;; *) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + ;; esac dnl Some gcc compiler versions have a problem when using an unsigned count @@ -552,7 +552,7 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl ], [;], [ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ], [ AC_MSG_RESULT(yes) @@ -579,8 +579,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl AC_TRY_COMPILE([], [;], [ AC_MSG_RESULT(yes) - CXXFLAGSG="$CXXFLAGSG -Wno-long-double" - CXXFLAGSO="$CXXFLAGSO -Wno-long-double" + CXXFLAGSG="$CXXFLAGSG -Wno-long-double" + CXXFLAGSO="$CXXFLAGSO -Wno-long-double" ], [ AC_MSG_RESULT(no) @@ -602,11 +602,11 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl from the preprocessor *dec-osf*) AC_MSG_CHECKING(for preprocessor warning with cuserid) - CXXFLAGS="$CXXFLAGSG -Werror" - AC_TRY_COMPILE( + CXXFLAGS="$CXXFLAGSG -Werror" + AC_TRY_COMPILE( [ -# include -# include +# include +# include ], [;], [ @@ -632,37 +632,37 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl case "$GXX_VERSION" in ibm_xlc) dnl Set flags for IBM's xlC compiler. As of version 11.1, it still - dnl doesn't grok all of deal.II, but it's getting closer. The - dnl -qxflag=EnableIssue214PartialOrdering flag is necessary to - dnl resolve code like this that we have in the MemoryConsumption - dnl namespace: - dnl ---------------------------------------------- - dnl template void f (T* const); - dnl template void f (const T &); - dnl - dnl void g() { - dnl int *p; - dnl f(p); - dnl } - dnl ---------------------------------------------- + dnl doesn't grok all of deal.II, but it's getting closer. The + dnl -qxflag=EnableIssue214PartialOrdering flag is necessary to + dnl resolve code like this that we have in the MemoryConsumption + dnl namespace: + dnl ---------------------------------------------- + dnl template void f (T* const); + dnl template void f (const T &); + dnl + dnl void g() { + dnl int *p; + dnl f(p); + dnl } + dnl ---------------------------------------------- dnl dnl Similarly, -qxflag=IgnoreCVOnTopOfFunctionTypes is necessary for - dnl ---------------------------------------------- - dnl struct S {}; - dnl S & foo (const S&); - dnl - dnl struct X { - dnl template - dnl void f (const T &t) const; - dnl }; - dnl - dnl void - dnl print_summary () - dnl { - dnl X x; - dnl x.f (foo); - dnl } - dnl ---------------------------------------------- + dnl ---------------------------------------------- + dnl struct S {}; + dnl S & foo (const S&); + dnl + dnl struct X { + dnl template + dnl void f (const T &t) const; + dnl }; + dnl + dnl void + dnl print_summary () + dnl { + dnl X x; + dnl x.f (foo); + dnl } + dnl ---------------------------------------------- dnl We have this kind of code with S=std::ostream, foo=std::endl dnl and X=LogStream when we do things like dnl deallog << std::endl; @@ -705,46 +705,46 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl clang*) dnl Like many other compilers, clang produces warnings for array - dnl accesses out of bounds, even if they are in code that's dead - dnl for this dimension. Suppress this. - dnl - dnl There are a number of other warnings we get that can't easily - dnl be worked around and that are definitely not useful. Suppress - dnl those too. + dnl accesses out of bounds, even if they are in code that's dead + dnl for this dimension. Suppress this. + dnl + dnl There are a number of other warnings we get that can't easily + dnl be worked around and that are definitely not useful. Suppress + dnl those too. CXXFLAGSG="$CXXFLAGS -DDEBUG -g -Wall -Wno-array-bounds -Wno-parentheses -Wno-delete-non-virtual-dtor -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-variable" CXXFLAGSO="$CXXFLAGS -O2 -Wno-array-bounds -Wno-parentheses -Wno-delete-non-virtual-dtor -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-variable" - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + ;; intel_icc*) dnl Earlier icc versions used -Kxxx for flags. Later versions use dnl the gcc convention -fxxx. Also, at least since icc11, the dnl flag -inline_debug_info has been deprecated, so don't use - dnl it any more - dnl - dnl Exception handling is also standard in later versions, as is rtti - case "$GXX_VERSION" in - intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) - CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info" + dnl it any more + dnl + dnl Exception handling is also standard in later versions, as is rtti + case "$GXX_VERSION" in + intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info" CXXFLAGSO="$CXXFLAGSO -Kc++eh -Krtti -O2 -unroll" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC" ;; - intel_icc*) - CXXFLAGSG="$CXXFLAGSG -DDEBUG" + intel_icc*) + CXXFLAGSG="$CXXFLAGSG -DDEBUG" CXXFLAGSO="$CXXFLAGSO -O2 -unroll" CXXFLAGSPIC="-fPIC" - LDFLAGS="$LDFLAGS -lstdc++ -lpthread" + LDFLAGS="$LDFLAGS -lstdc++ -lpthread" LDFLAGSPIC="-fPIC" ;; esac dnl Disable some compiler warnings, as they often are wrong on dnl our code: - dnl #11: ` unrecognized preprocessing directive" (we use - dnl #warning at one place) + dnl #11: ` unrecognized preprocessing directive" (we use + 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 #327: `NULL reference is not allowed' (this happens when we @@ -754,48 +754,48 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl #525: `type "DataOutBase::DataOutBase" is an inaccessible type dnl (allowed for compatibility)' (I don't understand what the dnl compiler means) - dnl #734: `X::X(const X&), required for copy that was eliminated, is - dnl inaccessible' - 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 #734: `X::X(const X&), required for copy that was eliminated, is + dnl inaccessible' + 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) CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858" CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11" dnl To reduce output, use -opt_report_levelmin where possible, dnl i.e. post icc5. from icc10 onwards, this flag is called - dnl -opt-report, and -vec-report controls output of the + dnl -opt-report, and -vec-report controls output of the dnl autovectorizer (to make things simpler, one of the two options dnl wants a space between option and level, whereas the other does dnl not) - dnl - dnl Since only the x86 and x86_64 compilers can vectorize, this - dnl flag needs to be suppressed on ia64 (itanium) - case "$GXX_VERSION" in - intel_icc5) + dnl + dnl Since only the x86 and x86_64 compilers can vectorize, this + dnl flag needs to be suppressed on ia64 (itanium) + case "$GXX_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" ;; - *) - case "$target" in - *ia64*) - CXXFLAGSO="$CXXFLAGSO -opt-report 0" - ;; - *) - CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0" - ;; - esac - ;; + *) + case "$target" in + *ia64*) + CXXFLAGSO="$CXXFLAGSO -opt-report 0" + ;; + *) + CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0" + ;; + esac + ;; esac - dnl Some versions of icc on some platforms issue a lot of warnings - dnl about the unreliability of floating point comparisons. Check - dnl whether we can switch that off - DEAL_II_ICC_WD_1572 + dnl Some versions of icc on some platforms issue a lot of warnings + dnl about the unreliability of floating point comparisons. Check + dnl whether we can switch that off + DEAL_II_ICC_WD_1572 dnl We would really like to use -ansi -Xc, since that - dnl is _very_ picky about standard C++, and is thus very efficient + dnl is _very_ picky about standard C++, and is thus very efficient dnl in detecting slight standard violations, but these flags are dnl also very efficient in crashing the compiler (it generates a dnl segfault), at least with versions prior to 7.0. So only @@ -807,42 +807,42 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl CXXFLAGSG="$CXXFLAGSG -Xc -ansi" CXXFLAGSO="$CXXFLAGSO -ansi_alias" dnl For icc8: - dnl avoid the annoying `LOOP WAS VECTORIZED' remarks + dnl avoid the annoying `LOOP WAS VECTORIZED' remarks dnl use -vec_report0 for reducing output else if test "x$GXX_VERSION" = "xintel_icc8" ; then CXXFLAGSO="$CXXFLAGSO -ansi_alias -vec_report0" fi fi - dnl If we are on an x86 platform, add -tpp6 to optimization - dnl flags (for version <10), or the equivalent for later - dnl processors - case "$target" in + dnl If we are on an x86 platform, add -tpp6 to optimization + dnl flags (for version <10), or the equivalent for later + dnl processors + case "$target" in *x86_64*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + LDFLAGS="$LDFLAGS -lpthread" + ;; - *86*) - case "$GXX_VERSION" in - intel_icc5) + *86*) + case "$GXX_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CXXFLAGSO="$CXXFLAGSO -tpp6" ;; - *) + *) CXXFLAGSO="$CXXFLAGSO -mcpu=pentium4" - ;; + ;; esac - ;; - esac + ;; + esac - dnl Finally, see if the compiler supports C++0x - DEAL_II_CHECK_CXX1X + dnl Finally, see if the compiler supports C++0x + DEAL_II_CHECK_CXX1X ;; compaq_cxx) dnl Disable some warning messages: - dnl #11: ` unrecognized preprocessing directive" (we use - dnl #warning at one place) + dnl #11: ` unrecognized preprocessing directive" (we use + dnl #warning at one place) dnl #175: `subscript out of range' (detected when instantiating a dnl template and looking at the indices of an array of dnl template dependent size, this error is triggered in a @@ -864,8 +864,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl dnl #1182:`statement either is unreachable or causes unreachable code' dnl (happens in switch(dim) clauses for other dimensions than dnl the present one) - dnl #450:`the type "long long" is nonstandard' - dnl BOOST uses long long, unfortunately + dnl #450:`the type "long long" is nonstandard' + dnl BOOST uses long long, unfortunately dnl dnl Also disable the following error: dnl #265: `class "..." is inaccessible' (happens when we try to @@ -909,14 +909,14 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-G" - dnl See if the flag -library=stlport4 is available, and if so use it - CXXFLAGS="$CXXFLAGSG -library=stlport4" - AC_MSG_CHECKING(whether -library=stlport4 works) - AC_TRY_COMPILE( + dnl See if the flag -library=stlport4 is available, and if so use it + CXXFLAGS="$CXXFLAGSG -library=stlport4" + AC_MSG_CHECKING(whether -library=stlport4 works) + AC_TRY_COMPILE( [ - ], + ], [ - ; + ; ], [ AC_MSG_RESULT(yes) @@ -926,58 +926,58 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl [ AC_MSG_RESULT(no) ]) - ;; + ;; pgCC*) - dnl Suppress warnings: - dnl #68: "integer conversion resulted in a change of sign". This - dnl is what we get every time we use - dnl numbers::invalid_unsigned_int + dnl Suppress warnings: + dnl #68: "integer conversion resulted in a change of sign". This + dnl is what we get every time we use + dnl numbers::invalid_unsigned_int dnl #111: "Statement unreachable": we use return statements - dnl occasionally after case-switches where you cannot - dnl fall though, but other compilers sometimes complain - dnl that the function might not return with a value, if + dnl occasionally after case-switches where you cannot + dnl fall though, but other compilers sometimes complain + dnl that the function might not return with a value, if dnl it can't figure out that the function always uses dnl one case. Also: a return statement after a failing dnl assertion - dnl #128: a similar case -- code not reachable because there's - dnl a return that's active for a particular space dimension - dnl #155: no va_start() seen -- happens alwas in lines 138 and 891 - dnl and seems to be spurious + dnl #128: a similar case -- code not reachable because there's + dnl a return that's active for a particular space dimension + dnl #155: no va_start() seen -- happens alwas in lines 138 and 891 + dnl and seems to be spurious dnl #177: "function declared but not used": might happen with dnl templates and conditional compilation - dnl #175: "out-of-bounds array indices": the same reason as - dnl for Compaq cxx - dnl #185: "dynamic initialization in unreachable code". similar to - dnl the case #128 above - dnl #236: "controlling expression is constant". this triggers - dnl somewhere in BOOST with BOOST_ASSERT. I have no idea - dnl what happens here - dnl #284: "NULL references not allowed" - CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" + dnl #175: "out-of-bounds array indices": the same reason as + dnl for Compaq cxx + dnl #185: "dynamic initialization in unreachable code". similar to + dnl the case #128 above + dnl #236: "controlling expression is constant". this triggers + dnl somewhere in BOOST with BOOST_ASSERT. I have no idea + dnl what happens here + dnl #284: "NULL references not allowed" + CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" CXXFLAGSO="$CXXFLAGSO -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" CXXFLAGSPIC="-Kpic" - dnl pgCC can't (as of writing this, with version 12.5 in mid-2012) compile a part of BOOST. - dnl Fortunately, BOOST provides a workaround by setting a specific preprocessor - dnl symbol that can be set. Do so. - CXXFLAGSG="$CXXFLAGSG -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" - CXXFLAGSO="$CXXFLAGSO -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" + dnl pgCC can't (as of writing this, with version 12.5 in mid-2012) compile a part of BOOST. + dnl Fortunately, BOOST provides a workaround by setting a specific preprocessor + dnl symbol that can be set. Do so. + CXXFLAGSG="$CXXFLAGSG -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" + CXXFLAGSO="$CXXFLAGSO -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" ;; kai_cc) CXXFLAGSG="$CXXFLAGSG --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename" CXXFLAGSO="$CXXFLAGSO +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number" CXXFLAGSPIC="-fPIC" - ;; + ;; hp_aCC) - dnl ??? disable warning 655 (about all-inlined functions) which - dnl triggers for each and every of our DeclExceptionX calls ??? + dnl ??? disable warning 655 (about all-inlined functions) which + dnl triggers for each and every of our DeclExceptionX calls ??? CXXFLAGSG="$CXXFLAGSG -g1 -AA +p" CXXFLAGSO="$CXXFLAGSO -z +O2 -AA" CXXFLAGSPIC="+Z" - # for linking shared libs, -b is also necessary... + # for linking shared libs, -b is also necessary... ;; borland_bcc) @@ -986,17 +986,17 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl CXXFLAGSPIC="" LDFLAGSPIC="" AC_MSG_ERROR(Attention! deal.II is not known to work with Borland C++! - If you intend to port it to Borland C++, please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this, you will NOT want to do it!) + If you intend to port it to Borland C++, please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this, you will NOT want to do it!) ;; pathscale_cc) - CXXFLAGSG="$CXXFLAGSG -DDEBUG -g" - CXXFLAGSO="$CXXFLAGSO -O3" + CXXFLAGSG="$CXXFLAGSG -DDEBUG -g" + CXXFLAGSO="$CXXFLAGSO -O3" ;; *) - CXXFLAGSG="$CXXFLAGSG -DDEBUG" - CXXFLAGSO="$CXXFLAGSO -O2" + CXXFLAGSG="$CXXFLAGSG -DDEBUG" + CXXFLAGSO="$CXXFLAGSO -O2" AC_MSG_RESULT(Unknown C++ compiler - using generic options) ;; esac @@ -1066,7 +1066,7 @@ AC_DEFUN(DEAL_II_SET_CXX_DEBUG_FLAG, dnl *) AC_MSG_CHECKING(whether -ggdb works) CXXFLAGS="-ggdb $CXXFLAGSG" - AC_TRY_COMPILE( + AC_TRY_COMPILE( [], [ ; ], [ @@ -1085,12 +1085,12 @@ AC_DEFUN(DEAL_II_SET_CXX_DEBUG_FLAG, dnl dnl which wants something entirely different case "$GXX_VERSION" in borland_bcc) - CXXFLAGSG="-v -y $CXXFLAGSG" - ;; + CXXFLAGSG="-v -y $CXXFLAGSG" + ;; *) - CXXFLAGSG="-g $CXXFLAGSG" - ;; + CXXFLAGSG="-g $CXXFLAGSG" + ;; esac fi ]) @@ -1274,8 +1274,8 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl [#include ], [ std::vector v; - auto i = v.begin(); - *i; + auto i = v.begin(); + *i; ], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no); extra_cxx1x_features_available=no ] @@ -1286,8 +1286,8 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl [#include ], [ std::vector v; - for (std::vector::iterator i : v) - *i; + for (std::vector::iterator i : v) + *i; ], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no); extra_cxx1x_features_available=no ] @@ -1397,30 +1397,30 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl else dnl Intel's ICC C compiler? On Linux, it uses -V, on Windows - dnl it is -help - dnl - dnl Annoyingly, ecc6.0 prints its version number on a separate - dnl line (the previous one ends with the string "applications"), - dnl so join this one to the previous one with a little bit of - dnl perl. + dnl it is -help + dnl + dnl Annoyingly, ecc6.0 prints its version number on a separate + dnl line (the previous one ends with the string "applications"), + dnl so join this one to the previous one with a little bit of + dnl perl. is_intel_icc1="`($CC -V 2>&1) | grep 'Intel'`" is_intel_icc2="`($CC -help 2>&1) | grep 'Intel'`" is_intel_ecc="`($CC -V 2>&1) | perl -pi -e 's/applications\n/\1/g;' | grep 'Intel(R) C++ Itanium(TM) Compiler'`" - is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc" + is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc" - dnl When calling the Portland Group compiler, it also - dnl outputs the string 'Intel' in its help text, so make - dnl sure we're not confused - is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" + dnl When calling the Portland Group compiler, it also + dnl outputs the string 'Intel' in its help text, so make + dnl sure we're not confused + is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x"; then - version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" - version5="`echo $version_string | grep 'Version 5'`" - version6="`echo $version_string | grep 'Version 6'`" - version7="`echo $version_string | grep 'Version 7'`" - version8="`echo $version_string | grep 'Version 8'`" - version9="`echo $version_string | grep 'Version 9'`" - version10="`echo $version_string | grep 'Version 10'`" + version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" + version5="`echo $version_string | grep 'Version 5'`" + version6="`echo $version_string | grep 'Version 6'`" + version7="`echo $version_string | grep 'Version 7'`" + version8="`echo $version_string | grep 'Version 8'`" + version9="`echo $version_string | grep 'Version 9'`" + version10="`echo $version_string | grep 'Version 10'`" if test "x$version5" != "x" ; then AC_MSG_RESULT(C compiler is icc-5) CC_VERSION=intel_icc5 @@ -1452,14 +1452,14 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl CC_VERSION=compaq_cxx else - dnl Sun Workshop? + dnl Sun Workshop? is_sun_cc="`($CC -V 2>&1) | grep 'Sun WorkShop'`" if test "x$is_sun_cc" != "x" ; then AC_MSG_RESULT(C compiler is Sun Workshop compiler) CC_VERSION=sun_workshop else - dnl Sun Forte? + dnl Sun Forte? is_sun_forte_cc="`($CC -V 2>&1) | grep 'Forte'`" is_sun_cc="`($CC -V 2>&1) | grep 'Sun C'`" if test "x$is_sun_forte_cc$is_sun_cc" != "x" ; then @@ -1467,61 +1467,61 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl CC_VERSION=sun_cc else - dnl Portland Group C? - is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" - if test "x$is_pgcc" != "x" ; then - CC_VERSION_STRING=`($CC -V 2>&1) | grep "^pgcc"` + dnl Portland Group C? + is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" + if test "x$is_pgcc" != "x" ; then + CC_VERSION_STRING=`($CC -V 2>&1) | grep "^pgcc"` full_version=`echo "$CC_VERSION_STRING" | perl -pi -e 's/.*pgcc\s+(\S+).*/\1/g;'` - CC_VERSION=pgcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` - AC_MSG_RESULT(C compiler is Portland Group C $full_version) - else - - dnl HP aCC? - is_aCC="`($CC -V 2>&1) | grep 'aCC'`" - if test "x$is_aCC" != "x" ; then - AC_MSG_RESULT(C compiler is HP aCC) - CC_VERSION=hp_aCC - else - - dnl Borland C - is_bcc="`($CC -h 2>&1) | grep 'Borland'`" - if test "x$is_bcc" != "x" ; then - AC_MSG_RESULT(C compiler is Borland C) - CC_VERSION=borland_bcc - else - - is_clang="`($CC --version 2>&1) | grep clang`" - if test "x$is_clang" != x ; then + CC_VERSION=pgcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + AC_MSG_RESULT(C compiler is Portland Group C $full_version) + else + + dnl HP aCC? + is_aCC="`($CC -V 2>&1) | grep 'aCC'`" + if test "x$is_aCC" != "x" ; then + AC_MSG_RESULT(C compiler is HP aCC) + CC_VERSION=hp_aCC + else + + dnl Borland C + is_bcc="`($CC -h 2>&1) | grep 'Borland'`" + if test "x$is_bcc" != "x" ; then + AC_MSG_RESULT(C compiler is Borland C) + CC_VERSION=borland_bcc + else + + is_clang="`($CC --version 2>&1) | grep clang`" + if test "x$is_clang" != x ; then AC_MSG_RESULT(C compiler is clang) - CC_VERSION=clang - else - - dnl KAI C? It seems as if the documented options - dnl -V and --version are not always supported, so give - dnl the whole thing a second try by looking for /KCC/ - dnl somewhere in the paths that are output by -v. This - dnl is risky business, since this combination of - dnl characters might appear on other installations + CC_VERSION=clang + else + + dnl KAI C? It seems as if the documented options + dnl -V and --version are not always supported, so give + dnl the whole thing a second try by looking for /KCC/ + dnl somewhere in the paths that are output by -v. This + dnl is risky business, since this combination of + dnl characters might appear on other installations dnl of other compilers as well, so put this test to dnl the very end of the detection chain for the dnl various compilers - is_kai_cc="`($CC --version 2>&1) | grep 'KAI C'`" - is_kai_cc="$is_kai_cc`($CC -v 2>&1) | grep /KCC/`" - if test "x$is_kai_cc" != "x" ; then - AC_MSG_RESULT(C compiler is KAI C) - CC_VERSION=kai_cc - else + is_kai_cc="`($CC --version 2>&1) | grep 'KAI C'`" + is_kai_cc="$is_kai_cc`($CC -v 2>&1) | grep /KCC/`" + if test "x$is_kai_cc" != "x" ; then + AC_MSG_RESULT(C compiler is KAI C) + CC_VERSION=kai_cc + else dnl Aw, nothing suitable found... AC_MSG_RESULT([Unrecognized compiler -- still trying]) - CC_VERSION=unknown_cc + CC_VERSION=unknown_cc fi - fi + fi fi fi fi fi - fi + fi fi fi fi @@ -1556,12 +1556,12 @@ AC_DEFUN(DEAL_II_SET_CC_FLAGS, dnl dnl DEC OSF. case "$target" in *aix* ) - CFLAGSPIC= - ;; + CFLAGSPIC= + ;; *dec-osf* ) - CFLAGSPIC="-fPIC" - ;; + CFLAGSPIC="-fPIC" + ;; *cygwin*) CFLAGSPIC= @@ -1578,8 +1578,8 @@ AC_DEFUN(DEAL_II_SET_CC_FLAGS, dnl ;; *) - CFLAGSPIC="-fPIC" - ;; + CFLAGSPIC="-fPIC" + ;; esac else @@ -1593,7 +1593,7 @@ AC_DEFUN(DEAL_II_SET_CC_FLAGS, dnl ibm_xlc) CFLAGSO="$CFLAGS -O2" CFLAGSPIC="-fPIC" - SHLIBLD="$CXX" + SHLIBLD="$CXX" ;; MIPSpro*) @@ -1603,73 +1603,73 @@ AC_DEFUN(DEAL_II_SET_CC_FLAGS, dnl intel_icc*) CFLAGSO="$CFLAGS -O2 -unroll" - case "$CC_VERSION" in - intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + case "$CC_VERSION" in + intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSPIC="-KPIC" - ;; + ;; - intel_icc*) - CFLAGSPIC="-fPIC" - ;; - esac + intel_icc*) + CFLAGSPIC="-fPIC" + ;; + esac dnl To reduce output, use -opt_report_levelmin where possible, dnl i.e. post icc5. from icc10 onwards, this flag is called - dnl -opt-report, and -vec-report controls output of the + dnl -opt-report, and -vec-report controls output of the dnl autovectorizer (to make things simpler, one of the two options dnl wants a space between option and level, whereas the other does dnl not) - case "$CC_VERSION" in - intel_icc5) + case "$CC_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSO="$CFLAGSO -opt_report_levelmin" ;; - *) + *) CFLAGSO="$CFLAGSO -opt-report 0 -vec-report0" - ;; + ;; esac CFLAGSO="$CFLAGSO -ansi_alias -vec_report0" - dnl If we are on an x86 platform, add -tpp6 to optimization - dnl flags - case "$target" in - *86*) - case "$CC_VERSION" in - intel_icc5) + dnl If we are on an x86 platform, add -tpp6 to optimization + dnl flags + case "$target" in + *86*) + case "$CC_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSO="$CFLAGSO -tpp6" ;; - *) + *) CFLAGSO="$CFLAGSO -mcpu=pentium4" - ;; + ;; esac - ;; - esac + ;; + esac - dnl Check whether we can switch off the annoying 1572 warning - dnl message about unreliable floating point comparisons - DEAL_II_ICC_C_WD_1572 + dnl Check whether we can switch off the annoying 1572 warning + dnl message about unreliable floating point comparisons + DEAL_II_ICC_C_WD_1572 ;; clang) - CFLAGS="$CFLAGS -g" - CFLAGSO="$CFLAGS -fast -O2" - CFLAGSPIC="-fPIC" - ;; + CFLAGS="$CFLAGS -g" + CFLAGSO="$CFLAGS -fast -O2" + CFLAGSPIC="-fPIC" + ;; sun_cc*) CFLAGS="$CFLAGS -g" CFLAGSO="$CFLAGS -fast -O2" - CFLAGSPIC="-fPIC" + CFLAGSPIC="-fPIC" ;; *) AC_MSG_RESULT(Unknown C compiler - using generic options) - CFLAGSO="$CFLAGSO -O2" + CFLAGSO="$CFLAGSO -O2" ;; esac fi @@ -1697,7 +1697,7 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl dnl command lines :-( F77_VERSION_STRING="`($F77 -v 2>&1) | head -n 10`" if test -n "`echo $F77_VERSION_STRING | grep \"GNU F77\"`" -o \ - -n "`echo $F77_VERSION_STRING | grep \"gcc version\"`" ; then + -n "`echo $F77_VERSION_STRING | grep \"gcc version\"`" ; then dnl Yes, this is a GNU g77 version. find out the right version G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`" @@ -1726,24 +1726,24 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl -o \ -n "`echo $F77_VERSION_STRING | grep \"Forte Developer\"`" ; then dnl OK, this is the Sun Fortran77 compiler - AC_MSG_RESULT(F77 compiler is Sun WorkShop f77) - F77_VERSION="SunF77" + AC_MSG_RESULT(F77 compiler is Sun WorkShop f77) + F77_VERSION="SunF77" else dnl If we can detect IRIX's f77 somehow, then the following flags dnl might be appropriate: F77_VERSION_STRING=`($F77 -version 2>&1)` - if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then - AC_MSG_RESULT(F77 compiler is MIPSpro f77) - F77_VERSION="MIPSproF77" + if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then + AC_MSG_RESULT(F77 compiler is MIPSpro f77) + F77_VERSION="MIPSproF77" else F77_VERSION_STRING=`($F77 -V 2>&1)` is_intel_ifc="`echo $F77_VERSION_STRING | grep 'Intel(R) Fortran'`" - if test "x$is_intel_ifc" != "x" ; then - AC_MSG_RESULT(F77 compiler is Intel Fortran) + if test "x$is_intel_ifc" != "x" ; then + AC_MSG_RESULT(F77 compiler is Intel Fortran) F77_VERSION=INTEL_F77 else @@ -1751,7 +1751,7 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl dnl Now, this is a hard case, we have no more clues... F77_VERSION="UnknownF77" - AC_MSG_RESULT(F77 compiler is unknown. no flags set!) + AC_MSG_RESULT(F77 compiler is unknown. no flags set!) fi fi fi @@ -1787,39 +1787,39 @@ AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl ;; *apple-darwin*) - dnl Add -m64 to flags for the same TBB-related reason as - dnl above when setting CXXFLAGS + dnl Add -m64 to flags for the same TBB-related reason as + dnl above when setting CXXFLAGS if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then - F77FLAGSG="$F77FLAGSG -m64" + F77FLAGSG="$F77FLAGSG -m64" F77FLAGSO="$F77FLAGSO -m64" fi - ;; + ;; * ) - F77FLAGSPIC="-fPIC" + F77FLAGSPIC="-fPIC" ;; esac - dnl Make sure we link both possible libraries here. Shame on gfortran! - AC_CHECK_LIB(g2c, e_wsfe, [ F77LIBS="$F77LIBS -lg2c" ]) + dnl Make sure we link both possible libraries here. Shame on gfortran! + AC_CHECK_LIB(g2c, e_wsfe, [ F77LIBS="$F77LIBS -lg2c" ]) - dnl Check whether libgfortran contains certain symbols. We used - dnl to use _gfortran_allocate but that appears to have disappeared - dnl at one point in time so if we can't find it check other symbols - dnl till we find one we recognize - AC_CHECK_LIB(gfortran, _gfortran_allocate, [found=1]) + dnl Check whether libgfortran contains certain symbols. We used + dnl to use _gfortran_allocate but that appears to have disappeared + dnl at one point in time so if we can't find it check other symbols + dnl till we find one we recognize + AC_CHECK_LIB(gfortran, _gfortran_allocate, [found=1]) AC_CHECK_LIB(gfortran, _gfortran_st_write_done, [found=1]) - dnl libgfortran appears to exist. Link with it. + dnl libgfortran appears to exist. Link with it. if test "x$found" = "x1" ; then F77LIBS="$F77LIBS -lgfortran" fi - ;; + ;; AIXF77) - dnl Set flags for AIX's xlf compiler. -qextname instructs the compiler - dnl to append an underscore to external function names, which is what - dnl we expect when linking with FORTRAN functions + dnl Set flags for AIX's xlf compiler. -qextname instructs the compiler + dnl to append an underscore to external function names, which is what + dnl we expect when linking with FORTRAN functions F77FLAGSG="$FFLAGS -g -qextname" F77FLAGSO="$FFLAGS -O3 -w -qextname" F77LIBS="$F77LIBS -lxlf90" @@ -1828,42 +1828,42 @@ AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl ;; SunF77) - F77FLAGSG="$FFLAGS -silent -g" - F77FLAGSO="$FFLAGS -silent -O3 -w" - F77LIBS="$F77LIBS -lF77 -lsunmath -lM77" + F77FLAGSG="$FFLAGS -silent -g" + F77FLAGSO="$FFLAGS -silent -O3 -w" + F77LIBS="$F77LIBS -lF77 -lsunmath -lM77" F77FLAGSPIC="-PIC" - ;; + ;; MIPSproF77) - F77FLAGSG="$FFLAGS -ansi -g" - F77FLAGSO="$FFLAGS -O3 -woffall" - F77LIBS="$F77LIBS -lftn" + F77FLAGSG="$FFLAGS -ansi -g" + F77FLAGSO="$FFLAGS -O3 -woffall" + F77LIBS="$F77LIBS -lftn" - F77FLAGSPIC="shared -KPIC" - ;; + F77FLAGSPIC="shared -KPIC" + ;; INTEL_F77*) F77FLAGSG="$FFLAGS" F77FLAGSO="$FFLAGS -O3" - ;; + ;; UnknownF77) - dnl Disable unknown FORTRAN compiler. - dnl Allows configure to finish, - dnl but disables compiling FORTRAN code - F77="UnknownF77" + dnl Disable unknown FORTRAN compiler. + dnl Allows configure to finish, + dnl but disables compiling FORTRAN code + F77="UnknownF77" F77FLAGSG="$FFLAGS -g" F77FLAGSO="$FFLAGS -O2" F77LIBS="$F77LIBS" F77FLAGSPIC="unknown!" - AC_MSG_RESULT(Unknown FORTRAN compiler has been disabled!) + AC_MSG_RESULT(Unknown FORTRAN compiler has been disabled!) ;; dnl Keep this line just in case we change default options - dnl back to error message + dnl back to error message *) - AC_MSG_ERROR(No compiler options for F77 compiler "$F77_VERSION" specified: modification of aclocal.m4 necessary) + AC_MSG_ERROR(No compiler options for F77 compiler "$F77_VERSION" specified: modification of aclocal.m4 necessary) ;; esac ]) @@ -1997,57 +1997,57 @@ AC_DEFUN(DEAL_II_CHECK_CPU_OPTIMIZATIONS, dnl case "$withcpu" in PowerPC64) AC_MSG_RESULT(PowerPC64) - case "$GXX_VERSION" in - gcc*) - dnl Tune for this processor - CXXFLAGSG="$CXXFLAGSG -maix64" - CXXFLAGSO="$CXXFLAGSO -maix64 -mpowerpc64 -mcpu=powerpc64 -mtune=powerpc64" - - dnl On this stupid system, we get TOC overflows if we use the - dnl standard flags, so restrict TOC entries to the absolute minimal - CXXFLAGSG="$CXXFLAGSG -mminimal-toc" - CXXFLAGSO="$CXXFLAGSO -mminimal-toc" - - dnl Also set 64-bit mode for f77 compiler, assuming we use IBM's xlf - F77FLAGSG="$F77FLAGSG -q64" - F77FLAGSO="$F77FLAGSO -q64" - - dnl When generating 64-bit code, we need to pass respective flags when - dnl linking (also for static libs) - AR="$AR -X 64" - LDFLAGS="$LDFLAGS -maix64" - - dnl And we must always link with pthreads - DEAL_II_ADD_EXTERNAL_LIBS_AT_TAIL(-lpthread) + case "$GXX_VERSION" in + gcc*) + dnl Tune for this processor + CXXFLAGSG="$CXXFLAGSG -maix64" + CXXFLAGSO="$CXXFLAGSO -maix64 -mpowerpc64 -mcpu=powerpc64 -mtune=powerpc64" + + dnl On this stupid system, we get TOC overflows if we use the + dnl standard flags, so restrict TOC entries to the absolute minimal + CXXFLAGSG="$CXXFLAGSG -mminimal-toc" + CXXFLAGSO="$CXXFLAGSO -mminimal-toc" + + dnl Also set 64-bit mode for f77 compiler, assuming we use IBM's xlf + F77FLAGSG="$F77FLAGSG -q64" + F77FLAGSO="$F77FLAGSO -q64" + + dnl When generating 64-bit code, we need to pass respective flags when + dnl linking (also for static libs) + AR="$AR -X 64" + LDFLAGS="$LDFLAGS -maix64" + + dnl And we must always link with pthreads + DEAL_II_ADD_EXTERNAL_LIBS_AT_TAIL(-lpthread) ;; esac - ;; + ;; athlon* | pentium* | i386 | i486 | i586 | i686 | k6* | winchip* | opteron) AC_MSG_RESULT(x86 derivate ($withcpu)) - case "$GXX_VERSION" in - gcc*) - dnl Tune for this processor - CXXFLAGSG="$CXXFLAGSG -march=$withcpu" - CXXFLAGSO="$CXXFLAGSO -march=$withcpu" - - dnl Also set the mode for f77 compiler - F77FLAGSG="$F77FLAGSG -march=$withcpu" - F77FLAGSO="$F77FLAGSO -march=$withcpu" + case "$GXX_VERSION" in + gcc*) + dnl Tune for this processor + CXXFLAGSG="$CXXFLAGSG -march=$withcpu" + CXXFLAGSO="$CXXFLAGSO -march=$withcpu" + + dnl Also set the mode for f77 compiler + F77FLAGSG="$F77FLAGSG -march=$withcpu" + F77FLAGSO="$F77FLAGSO -march=$withcpu" ;; esac ;; native) AC_MSG_RESULT(native processor variant) - case "$GXX_VERSION" in - gcc*) - dnl Tune for this processor - CXXFLAGSG="$CXXFLAGSG -march=native" - CXXFLAGSO="$CXXFLAGSO -march=native" - - dnl Also set the mode for f77 compiler - F77FLAGSG="$F77FLAGSG -march=native" - F77FLAGSO="$F77FLAGSO -march=native" + case "$GXX_VERSION" in + gcc*) + dnl Tune for this processor + CXXFLAGSG="$CXXFLAGSG -march=native" + CXXFLAGSO="$CXXFLAGSO -march=native" + + dnl Also set the mode for f77 compiler + F77FLAGSG="$F77FLAGSG -march=native" + F77FLAGSO="$F77FLAGSO -march=native" ;; intel_icc*) @@ -2060,7 +2060,7 @@ AC_DEFUN(DEAL_II_CHECK_CPU_OPTIMIZATIONS, dnl *) AC_MSG_RESULT(none given or not recognized) - ;; + ;; esac ]) @@ -2088,30 +2088,30 @@ AC_DEFUN(DEAL_II_DETECT_VECTORIZATION_LEVEL, dnl [ #include #include - int main() - { + int main() + { __m128d a, b; - const unsigned int vector_bytes = sizeof(__m128d); - const int n_vectors = vector_bytes/sizeof(double); - __m128d * data = - reinterpret_cast<__m128d*>(_mm_malloc (2*vector_bytes, vector_bytes)); - double * ptr = reinterpret_cast(&a); - ptr[0] = (volatile double)(1.0); - for (int i=1; i(&data[1]); - unsigned int return_value = 0; - if (ptr[0] != 7.3125) - return_value = 1; - for (int i=1; i(_mm_malloc (2*vector_bytes, vector_bytes)); + double * ptr = reinterpret_cast(&a); + ptr[0] = (volatile double)(1.0); + for (int i=1; i(&data[1]); + unsigned int return_value = 0; + if (ptr[0] != 7.3125) + return_value = 1; + for (int i=1; i #include - int main() - { + int main() + { __m256d a, b; - const unsigned int vector_bytes = sizeof(__m256d); - const int n_vectors = vector_bytes/sizeof(double); - __m256d * data = - reinterpret_cast<__m256d*>(_mm_malloc (2*vector_bytes, vector_bytes)); - double * ptr = reinterpret_cast(&a); - ptr[0] = (volatile double)(1.0); - for (int i=1; i(&data[1]); - unsigned int return_value = 0; - if (ptr[0] != 7.3125) - return_value = 1; - for (int i=1; i(_mm_malloc (2*vector_bytes, vector_bytes)); + double * ptr = reinterpret_cast(&a); + ptr[0] = (volatile double)(1.0); + for (int i=1; i(&data[1]); + unsigned int return_value = 0; + if (ptr[0] != 7.3125) + return_value = 1; + for (int i=1; i - ], + AC_MSG_CHECKING(for only partly bracketed mutex initializer) + AC_LANG(C++) + CXXFLAGS="$CXXFLAGSG -Werror" + AC_TRY_COMPILE( + [ +# include + ], [;], [ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ], [ - AC_MSG_RESULT(yes) - CXXFLAGSG="$CXXFLAGSG -Wno-missing-braces" - CXXFLAGSO="$CXXFLAGSO -Wno-missing-braces" + AC_MSG_RESULT(yes) + CXXFLAGSG="$CXXFLAGSG -Wno-missing-braces" + CXXFLAGSO="$CXXFLAGSO -Wno-missing-braces" ]) - ;; + ;; *) ;; esac @@ -2477,86 +2477,86 @@ AC_DEFUN(DEAL_II_CHECK_POSIX_THREAD_FUNCTIONS, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ -# include +# include ], [ - pthread_t p; - pthread_create (&p, 0, 0, 0); - pthread_join (p, 0); + pthread_t p; + pthread_create (&p, 0, 0, 0); + pthread_join (p, 0); ], [ - AC_MSG_RESULT(ok) + AC_MSG_RESULT(ok) ], [ - AC_MSG_ERROR(not found) + AC_MSG_ERROR(not found) ]) AC_MSG_CHECKING(for posix thread mutex functions) AC_LANG(C++) AC_TRY_COMPILE( [ -# include +# include ], [ - pthread_mutex_t pm; - pthread_mutex_init (&pm, 0); - pthread_mutex_lock (&pm); - pthread_mutex_unlock (&pm); - pthread_mutex_destroy (&pm); + pthread_mutex_t pm; + pthread_mutex_init (&pm, 0); + pthread_mutex_lock (&pm); + pthread_mutex_unlock (&pm); + pthread_mutex_destroy (&pm); ], [ - AC_MSG_RESULT(ok) + AC_MSG_RESULT(ok) ], [ - AC_MSG_ERROR(not found) + AC_MSG_ERROR(not found) ]) AC_MSG_CHECKING(for posix thread condition variable functions) AC_LANG(C++) AC_TRY_COMPILE( [ -# include +# include ], [ - pthread_cond_t pc; - pthread_cond_init (&pc, 0); - pthread_cond_signal (&pc); - pthread_cond_broadcast (&pc); + pthread_cond_t pc; + pthread_cond_init (&pc, 0); + pthread_cond_signal (&pc); + pthread_cond_broadcast (&pc); pthread_mutex_t pm; pthread_cond_wait (&pc, &pm); - pthread_cond_destroy (&pc); + pthread_cond_destroy (&pc); ], [ - AC_MSG_RESULT(ok) + AC_MSG_RESULT(ok) ], [ - AC_MSG_ERROR(not found) + AC_MSG_ERROR(not found) ]) AC_MSG_CHECKING(for posix thread barrier functions) AC_LANG(C++) AC_TRY_COMPILE( [ -# include +# include ], [ - pthread_barrier_t pb; - pthread_barrier_init (&pb, 0, 1); - pthread_barrier_wait (&pb); - pthread_barrier_destroy (&pb); + pthread_barrier_t pb; + pthread_barrier_init (&pb, 0, 1); + pthread_barrier_wait (&pb); + pthread_barrier_destroy (&pb); ], [ - AC_MSG_RESULT(ok) - x=0 + AC_MSG_RESULT(ok) + x=0 ], [ - AC_MSG_RESULT(not found. barriers will not be supported) - x=1 + AC_MSG_RESULT(not found. barriers will not be supported) + x=1 ]) if test "x$x" = "x1" ; then AC_DEFINE(DEAL_II_USE_MT_POSIX_NO_BARRIERS, 1, - [Defined if POSIX is supported but not the newer POSIX + [Defined if POSIX is supported but not the newer POSIX barrier functions. Barriers will then not work in the library, but the other threading functionality is available.]) @@ -2614,11 +2614,11 @@ AC_DEFUN(DEAL_II_CHECK_COMPAT_BLOCKER, dnl and classes that do not take an explicit mapping variable, but rather use a default Q1 mapping instead]) - ;; + ;; *) - AC_MSG_ERROR(Backward compatibility feature "$i" unknown) - ;; + AC_MSG_ERROR(Backward compatibility feature "$i" unknown) + ;; esac done ]) @@ -2644,17 +2644,17 @@ AC_DEFUN(DEAL_II_TRY_COMPILER_FLAG, dnl deal_II_compiler_output=`eval $ac_compile 2>&1` if test ! "$deal_II_compiler_output"; then ifelse([$1], , :, - [ - rm -rf conftest* - $1 - ]) + [ + rm -rf conftest* + $1 + ]) else echo "configure: failed program was:" >&AC_FD_CC cat conftest.$ac_ext >&AC_FD_CC ifelse([$2], , , - [ - rm -rf conftest* - $2 + [ + rm -rf conftest* + $2 ]) fi rm -f conftest* @@ -2689,18 +2689,18 @@ AC_DEFUN(DEAL_II_CHECK_GETRUSAGE, dnl getrusage(RUSAGE_SELF,ru); ], [ - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ], [ - AC_MSG_RESULT(no) - AC_DEFINE(NO_HAVE_GETRUSAGE, 1, + AC_MSG_RESULT(no) + AC_DEFINE(NO_HAVE_GETRUSAGE, 1, [On SunOS 4.x, the getrusage() function exists, but - is not declared in the respective header file - , as one would think when reading the - man pages. Then we have to declare this function - ourselves in those files that use this function. - The question whether we have to do so is controlled - by the preprocessor variable.]) + is not declared in the respective header file + , as one would think when reading the + man pages. Then we have to declare this function + ourselves in those files that use this function. + The question whether we have to do so is controlled + by the preprocessor variable.]) ]) ] ) @@ -2730,11 +2730,11 @@ extern "C" void abort () { for(;;) ; } [ ], [ - AC_MSG_RESULT(none) + AC_MSG_RESULT(none) ], [ - AC_MSG_RESULT(yes) - AC_DEFINE(DEAL_II_ABORT_NOTHROW_EXCEPTION, 1, + AC_MSG_RESULT(yes) + AC_DEFINE(DEAL_II_ABORT_NOTHROW_EXCEPTION, 1, [Defined if the prototype of abort() has a no-throw exception specification.]) ]) @@ -2759,9 +2759,9 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_CHECK_ISNAN, dnl [ DEAL_II_CHECK_ISNAN_FLAG(debug, $CXXFLAGSG, - CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG") + CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG") DEAL_II_CHECK_ISNAN_FLAG(optimized, $CXXFLAGSO, - CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO") + CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO") ] ) @@ -2788,13 +2788,13 @@ AC_DEFUN(DEAL_II_CHECK_ISNAN_FLAG, dnl #include ], [ - double d=0; - isnan (d); + double d=0; + isnan (d); ], [ - AC_MSG_RESULT(yes) - deal_II_isnan_flag="-DHAVE_ISNAN" - $3 + AC_MSG_RESULT(yes) + deal_II_isnan_flag="-DHAVE_ISNAN" + $3 ]) @@ -2806,13 +2806,13 @@ AC_DEFUN(DEAL_II_CHECK_ISNAN_FLAG, dnl #include ], [ - double d=0; - _isnan (d); + double d=0; + _isnan (d); ], [ - AC_MSG_RESULT(yes) - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" - $3 + AC_MSG_RESULT(yes) + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" + $3 ]) fi @@ -2827,17 +2827,17 @@ AC_DEFUN(DEAL_II_CHECK_ISNAN_FLAG, dnl AC_TRY_COMPILE( [ #include - ], - [ - double d=0; - isnan (d); - ], - [ - dnl We found a flag by which isnan is defined; store - dnl this flag and exit the loop - deal_II_isnan_flag="-DHAVE_ISNAN $testflag" - break; - ]) + ], + [ + double d=0; + isnan (d); + ], + [ + dnl We found a flag by which isnan is defined; store + dnl this flag and exit the loop + deal_II_isnan_flag="-DHAVE_ISNAN $testflag" + break; + ]) dnl If that didn't work (and it didn't as we are still inside the dnl loop), then try the _isnan function (maybe we are on a @@ -2845,17 +2845,17 @@ AC_DEFUN(DEAL_II_CHECK_ISNAN_FLAG, dnl AC_TRY_COMPILE( [ #include - ], - [ - double d=0; - _isnan (d); - ], - [ - dnl We found a flag by which isnan is defined; store - dnl this flag and exit the loop - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" - break; - ]) + ], + [ + double d=0; + _isnan (d); + ], + [ + dnl We found a flag by which isnan is defined; store + dnl this flag and exit the loop + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" + break; + ]) done dnl if no such flag was found, then abort ./configure since @@ -2891,12 +2891,12 @@ AC_DEFUN(DEAL_II_CHECK_ISFINITE, dnl #include ], [ - double d=0; - std::isfinite (d); + double d=0; + std::isfinite (d); ], [ - AC_MSG_RESULT(yes) - AC_DEFINE(DEAL_II_HAVE_ISFINITE, 1, + AC_MSG_RESULT(yes) + AC_DEFINE(DEAL_II_HAVE_ISFINITE, 1, [Defined if std::isfinite is available]) ], [ @@ -2922,21 +2922,21 @@ AC_DEFUN(DEAL_II_CHECK_RAND_R, dnl AC_LANG(C++) CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( - [ + [ #include - ], - [ + ], + [ unsigned int seed = 0; int i=rand_r(&i); - ], - [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RAND_R, 1, + ], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_RAND_R, 1, [Define if you have the rand_r function]) - ], - [ - AC_MSG_RESULT(no) - ] + ], + [ + AC_MSG_RESULT(no) + ] ) ]) @@ -2972,10 +2972,10 @@ class ExceptionBase : public std::exception { public: ExceptionBase (); ExceptionBase (const char* f, const int l, const char *func, - const char* c, const char *e); + const char* c, const char *e); virtual ~ExceptionBase () throw(); void SetFields (const char *f, const int l, const char *func, - const char *c, const char *e); + const char *c, const char *e); void PrintExcData (std::ostream &out) const; virtual void PrintInfo (std::ostream &out) const; virtual const char * what () const throw (); @@ -2987,29 +2987,29 @@ class ExceptionBase : public std::exception { template void __IssueError_Assert (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e){ + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e){ e.SetFields (file, line, function, cond, exc_name); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; e.PrintExcData (std::cerr); e.PrintInfo (std::cerr); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; std::abort (); } template void __IssueError_Throw (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e) { - // Fill the fields of the exception object + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e) { + // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; } @@ -3018,8 +3018,8 @@ void __IssueError_Throw (const char *file, { \ if (!(cond)) \ __IssueError_Throw (__FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, #cond, #exc, exc); \ + __LINE__, \ + __PRETTY_FUNCTION__, #cond, #exc, exc); \ } #define DeclException0(Exception0) \ @@ -3032,14 +3032,14 @@ namespace StandardExceptions using namespace StandardExceptions; ], [ - AssertThrow (false, ExcInternalError()); + AssertThrow (false, ExcInternalError()); ], [ - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ], [ - AC_MSG_RESULT(no) - $3 + AC_MSG_RESULT(no) + $3 ]) ]) @@ -3068,10 +3068,10 @@ AC_DEFUN(DEAL_II_HAVE_PRETTY_FUNCTION, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ -# include +# include ], [ - std::cout << __PRETTY_FUNCTION__ << std::endl; + std::cout << __PRETTY_FUNCTION__ << std::endl; ], [ AC_MSG_RESULT(yes) @@ -3081,18 +3081,18 @@ AC_DEFUN(DEAL_II_HAVE_PRETTY_FUNCTION, dnl AC_MSG_CHECKING(for __func__) AC_TRY_COMPILE( [ -# include +# include ], [ - std::cout << __func__ << std::endl; + std::cout << __func__ << std::endl; ], [ AC_MSG_RESULT(yes) - x=__func__ - ], + x=__func__ + ], [ AC_MSG_RESULT(no) - x="\"(not available)\"" + x="\"(not available)\"" ]) AC_DEFINE_UNQUOTED(__PRETTY_FUNCTION__, $x, [If already available, do not define at all. Otherwise, define @@ -3135,14 +3135,14 @@ AC_DEFUN(DEAL_II_CHECK_LOCAL_TYPEDEF_COMP, dnl CXXFLAGS="$CXXFLAGSG -g" AC_TRY_COMPILE( [ - template < int dim > struct T { - typedef T SubT; - T (SubT); - }; + template < int dim > struct T { + typedef T SubT; + T (SubT); + }; - template T::T (SubT) {} + template T::T (SubT) {} - template class T<3>; + template class T<3>; ], [], [ @@ -3195,20 +3195,20 @@ AC_DEFUN(DEAL_II_CHECK_TEMPLATE_SPEC_ACCESS, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ - template struct T { int bar (); }; + template struct T { int bar (); }; - template struct T<1,M> { + template struct T<1,M> { T (); - private: - static int i; - template friend class T; - }; + private: + static int i; + template friend class T; + }; - template int T::bar () { - return T::i; - } + template int T::bar () { + return T::i; + } - template class T<2,1>; + template class T<2,1>; ], [], [ @@ -3257,13 +3257,13 @@ AC_DEFUN(DEAL_II_CHECK_MEMBER_OP_TEMPLATE_INST, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ - struct X - { - template - X operator = (T2 &) { return X(); } - }; + struct X + { + template + X operator = (T2 &) { return X(); } + }; - template X X::operator= (float &); + template X X::operator= (float &); ], [], [ @@ -3329,7 +3329,7 @@ AC_DEFUN(DEAL_II_CHECK_EXPLICIT_DESTRUCTOR_BUG, dnl AC_MSG_RESULT(yes. using workaround) AC_DEFINE_UNQUOTED(DEAL_II_EXPLICIT_DESTRUCTOR_BUG, 1, [Define if we have to work around a bug where the - compiler doesn't accept an explicit destructor call. + compiler doesn't accept an explicit destructor call. See the aclocal.m4 file in the top-level directory for a description of this bug.]) ]) @@ -3376,27 +3376,27 @@ AC_DEFUN(DEAL_II_CHECK_NAMESP_TEMPL_FRIEND_BUG, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ - namespace NS { - template class C { - C(const C&); - template friend class C; - }; - } + namespace NS { + template class C { + C(const C&); + template friend class C; + }; + } - namespace NS2 { template class C; } + namespace NS2 { template class C; } - template class X { - template friend class NS2::C; - template friend class NS::C; - }; + template class X { + template friend class NS2::C; + template friend class NS::C; + }; - template class X; + template class X; - namespace NS { - template - inline C::C(const C&) + namespace NS { + template + inline C::C(const C&) {} - } + } ], [], [ @@ -3407,7 +3407,7 @@ AC_DEFUN(DEAL_II_CHECK_NAMESP_TEMPL_FRIEND_BUG, dnl AC_DEFINE_UNQUOTED(DEAL_II_NAMESP_TEMPL_FRIEND_BUG, 1, [Define if we have to work around a bug in gcc with marking all instances of a template class as friends - to this class if the class is inside a namespace. + to this class if the class is inside a namespace. See the aclocal.m4 file in the top-level directory for a description of this bug.]) ]) @@ -3448,19 +3448,19 @@ AC_DEFUN(DEAL_II_CHECK_NAMESP_TEMPL_FRIEND_BUG2, dnl CXXFLAGS="$CXXFLAGSG -Werror" AC_TRY_COMPILE( [ - namespace NS { - template struct Foo; - } + namespace NS { + template struct Foo; + } - class Bar { - template friend struct NS::Foo; - }; + class Bar { + template friend struct NS::Foo; + }; - namespace NS { - template struct Foo { Foo (); }; - } + namespace NS { + template struct Foo { Foo (); }; + } - template struct NS::Foo; + template struct NS::Foo; ], [], [ @@ -3471,7 +3471,7 @@ AC_DEFUN(DEAL_II_CHECK_NAMESP_TEMPL_FRIEND_BUG2, dnl AC_DEFINE_UNQUOTED(DEAL_II_NAMESP_TEMPL_FRIEND_BUG2, 1, [Define if we have to work around another bug in gcc with marking all instances of a template class as friends - to this class if the class is inside a namespace. + to this class if the class is inside a namespace. See the aclocal.m4 file in the top-level directory for a description of this bug.]) ]) @@ -3530,8 +3530,8 @@ template class X<1,int>; AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(DEAL_II_TEMPL_SPEC_FRIEND_BUG, 1, [Define if we have to work around a bug with some - compilers that will not allow us to specify a - fully specialized class of a template as a friend. + compilers that will not allow us to specify a + fully specialized class of a template as a friend. See the aclocal.m4 file in the top-level directory for a description of this bug.]) ]) @@ -3564,19 +3564,19 @@ AC_DEFUN(DEAL_II_CHECK_IMPLEMENTED_PURE_FUNCTION_BUG, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ - template - struct Function - { - public: - virtual ~Function () = 0; - }; + template + struct Function + { + public: + virtual ~Function () = 0; + }; - template - Function::~Function () - {} + template + Function::~Function () + {} - template class Function<1>; - template Function<1>::~Function(); + template class Function<1>; + template Function<1>::~Function(); ], [], [ @@ -3586,7 +3586,7 @@ AC_DEFUN(DEAL_II_CHECK_IMPLEMENTED_PURE_FUNCTION_BUG, dnl AC_MSG_RESULT(yes. using workaround) AC_DEFINE(DEAL_II_IMPLEMENTED_PURE_FUNCTION_BUG, 1, [Defined if the compiler refuses to compile the definition - of a function that was previously declared abstract.]) + of a function that was previously declared abstract.]) ]) ]) @@ -3620,17 +3620,17 @@ AC_DEFUN(DEAL_II_CHECK_TEMPLATE_TEMPLATE_TYPEDEF_BUG, dnl CXXFLAGS="$CXXFLAGSG" AC_TRY_COMPILE( [ - template struct TT { typedef int type; }; + template struct TT { typedef int type; }; - template