From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 1 Sep 2015 00:23:06 +0000 (-0500)
Subject: Bugfix: Fix type ambiguity for two calls to std::min
X-Git-Tag: v8.4.0-rc2~466^2~36
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4edfb02f76dde466bcdb8eb49ec40b3ec4ddac63;p=dealii.git

Bugfix: Fix type ambiguity for two calls to std::min
---

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index d6eec4e092..96394ba584 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -2397,9 +2397,10 @@ next_cell:
         for (unsigned int c=0; c<object->n_children(); ++c)
           for (unsigned int i=0; i<GeometryInfo<structdim>::vertices_per_cell; ++i)
             for (unsigned int j=0; j<GeometryInfo<structdim>::vertices_per_cell; ++j)
-              old_min_product = std::min (old_min_product,
-                                          child_alternating_forms[c][i] *
-                                          parent_alternating_forms[j]);
+              old_min_product =
+                std::min<double> (old_min_product,
+                                  child_alternating_forms[c][i] *
+                                  parent_alternating_forms[j]);
 
         // for the new minimum value,
         // replace mid-object
@@ -2419,9 +2420,10 @@ next_cell:
         for (unsigned int c=0; c<object->n_children(); ++c)
           for (unsigned int i=0; i<GeometryInfo<structdim>::vertices_per_cell; ++i)
             for (unsigned int j=0; j<GeometryInfo<structdim>::vertices_per_cell; ++j)
-              new_min_product = std::min (new_min_product,
-                                          child_alternating_forms[c][i] *
-                                          parent_alternating_forms[j]);
+              new_min_product =
+                std::min<double> (new_min_product,
+                                  child_alternating_forms[c][i] *
+                                  parent_alternating_forms[j]);
 
         // if new minimum value is
         // better than before, then set the