From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Wed, 11 Feb 2015 04:19:11 +0000 (-0600)
Subject: Disambiguate which operator* we want to take.
X-Git-Tag: v8.3.0-rc1~478^2~7
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c8a0153fbf00d8171fd94ad5ca5167ddfe51d1;p=dealii.git

Disambiguate which operator* we want to take.

Use an explicitly cast from int to double in a few places.
---

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<dim> (x*delta[0]));
+          points.push_back (Point<dim> (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<dim> (x*delta[0] + y*delta[1]));
+            points.push_back (Point<dim> (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<dim> (x*delta[0] + y*delta[1] + z*delta[2]));
+              points.push_back (Point<dim> (double(x)*delta[0] + double(y)*delta[1] + double(z)*delta[2]));
         break;
 
       default: