From 4edfb02f76dde466bcdb8eb49ec40b3ec4ddac63 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 31 Aug 2015 19:23:06 -0500 Subject: [PATCH] Bugfix: Fix type ambiguity for two calls to std::min --- source/grid/grid_tools.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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; cn_children(); ++c) for (unsigned int i=0; i::vertices_per_cell; ++i) for (unsigned int j=0; j::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 (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; cn_children(); ++c) for (unsigned int i=0; i::vertices_per_cell; ++i) for (unsigned int j=0; j::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 (new_min_product, + child_alternating_forms[c][i] * + parent_alternating_forms[j]); // if new minimum value is // better than before, then set the -- 2.39.5