]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Use the correct include file.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 4 Feb 2014 21:58:54 +0000 (21:58 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 4 Feb 2014 21:58:54 +0000 (21:58 +0000)
git-svn-id: https://svn.dealii.org/trunk@32408 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/base/quadrature_lib.cc

index 049b8de1e7ca151bccc21e268f2f97671cea0a82..7752b9d81eb2e346ef242cfb19c6a67b96492414 100644 (file)
@@ -19,6 +19,8 @@
 
 #include <cmath>
 #include <limits>
+#include <algorithm>
+
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -128,7 +130,7 @@ QGauss<1>::QGauss (const unsigned int n)
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       fmax (double_eps / 100, long_double_eps * 5)
+       std::max (double_eps / 100, long_double_eps * 5)
        :
        double_eps * 5
       );
@@ -215,7 +217,7 @@ compute_quadrature_points(const unsigned int q,
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       fmax (double_eps / 100, long_double_eps * 5)
+       std::max (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.