Changeset 975

Timestamp:

09/23/19 15:49:04 (5 years ago)

Author:

dubos

Message:

mesh_generation : GCC compatibility fixes

File:

• codes/mesh_generation/scvt/sphere_fast.h (modified) (6 diffs)

codes/mesh_generation/scvt/sphere_fast.h

@@ -28 +28 @@
 static inline void circum_main(int N)
 {
+  int i;
   // Any decent compiler should vectorize this
-  for(int i=0 ; i<N ; i++)
+  for(i=0 ; i<N ; i++)
     {
       //    b,c = B-A, C-A
@@ -67 +68 @@
 static inline void circum_copyin(int N, long *ind, double *points)
 {
-  for(int n=0 ; n<N ; n++)
+  int n;
+  for(n=0 ; n<N ; n++)
     {
       int i; const double *ptr;
@@ -87 +89 @@
 static inline void circum_copyout(int N, double *circ)
 {
-  for(int i=0 ; i<N ; i++)
+  int i;
+  for(i=0 ; i<N ; i++)
     {
       *circ++ = Dx[i];
@@ -97 +100 @@
 static inline void circum_batch(double *points, double *circ)
 {
-  for(int i=0 ; i<batchsize ; i++)
+  int i;
+  for(i=0 ; i<batchsize ; i++)
     {
       Ax[i]=*points++;
@@ -186 +190 @@
                                        double *bary)
 {
+  int cell;
   double A=0; // total area
   // loop over voronoi cells
-  for(int cell=0; cell<N ; cell++)
+  for(cell=0; cell<N ; cell++)
     {
       double aw,ax,ay,az; // weight and xyz coordinates of generator of voronoi cell
-      int deg;
+      int deg, edge;
       double gx=0., gy=0., gz=0.; // barycenter of current voronoi cell
       aw=*w_i++;
@@ -200 +205 @@
       //      if(cell<10) printf("deg[%d]=%d\n", cell, deg);
 
-      for(int edge=0; edge<deg ; edge++) // loop over edges of voronoi cell
+      for(edge=0; edge<deg ; edge++) // loop over edges of voronoi cell
         {
           int i,j; const double *ptr;