From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Tue, 4 Feb 2014 21:58:54 +0000 (+0000)
Subject: Use the correct include file.
X-Git-Tag: v8.2.0-rc1~881
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=160083d57c4cf24a245568f39d488b4397efc072;p=dealii.git

Use the correct include file.

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

diff --git a/deal.II/source/base/quadrature_lib.cc b/deal.II/source/base/quadrature_lib.cc
index 049b8de1e7..7752b9d81e 100644
--- a/deal.II/source/base/quadrature_lib.cc
+++ b/deal.II/source/base/quadrature_lib.cc
@@ -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
       );