From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Fri, 31 Jan 2014 07:33:59 +0000 (+0000)
Subject: Prior to C++11, fmax is a C99 function and not in namespace std
X-Git-Tag: v8.2.0-rc1~928
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d8ae4a66bbeeada0625a3ed5b2cbb370431676e;p=dealii.git

Prior to C++11, fmax is a C99 function and not in namespace std

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

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