]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Prior to C++11, fmax is a C99 function and not in namespace std
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Fri, 31 Jan 2014 07:33:59 +0000 (07:33 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Fri, 31 Jan 2014 07:33:59 +0000 (07:33 +0000)
git-svn-id: https://svn.dealii.org/trunk@32354 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/base/quadrature_lib.cc

index c0c5095e1cdf36f682a319d58bcc42afb41b37b5..049b8de1e7ca151bccc21e268f2f97671cea0a82 100644 (file)
@@ -128,7 +128,7 @@ QGauss<1>::QGauss (const unsigned int n)
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       std::fmax (double_eps / 100, long_double_eps * 5)
+       fmax (double_eps / 100, long_double_eps * 5)
        :
        double_eps * 5
       );
@@ -215,7 +215,7 @@ compute_quadrature_points(const unsigned int q,
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       std::fmax (double_eps / 100, long_double_eps * 5)
+       fmax (double_eps / 100, long_double_eps * 5)
        :
        double_eps * 5
       );

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.