From b3c8a0153fbf00d8171fd94ad5ca5167ddfe51d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 10 Feb 2015 22:19:11 -0600 Subject: [PATCH] Disambiguate which operator* we want to take. Use an explicitly cast from int to double in a few places. --- source/grid/grid_generator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index 5d9774865d..db8ee260b3 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -777,20 +777,20 @@ namespace GridGenerator { case 1: for (unsigned int x=0; x<=n_subdivisions[0]; ++x) - points.push_back (Point (x*delta[0])); + points.push_back (Point (double(x)*delta[0])); break; case 2: for (unsigned int y=0; y<=n_subdivisions[1]; ++y) for (unsigned int x=0; x<=n_subdivisions[0]; ++x) - points.push_back (Point (x*delta[0] + y*delta[1])); + points.push_back (Point (double(x)*delta[0] + double(y)*delta[1])); break; case 3: for (unsigned int z=0; z<=n_subdivisions[2]; ++z) for (unsigned int y=0; y<=n_subdivisions[1]; ++y) for (unsigned int x=0; x<=n_subdivisions[0]; ++x) - points.push_back (Point (x*delta[0] + y*delta[1] + z*delta[2])); + points.push_back (Point (double(x)*delta[0] + double(y)*delta[1] + double(z)*delta[2])); break; default: -- 2.39.5