Changeset 7d90aa in git for coeffs/mpr_base.cc

Timestamp:

Mar 8, 2011, 7:29:56 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

655a2976d656bc7749e136dea00a5bb75c14a0b4

Parents:

634d93b52f3d7540be44b7c941a206dc38b1b1be

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-08 19:29:56+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:49:00+01:00

Message:

initial changes to 'coeffs' + first build system

File:

• coeffs/mpr_base.cc (modified) (13 diffs)

coeffs/mpr_base.cc

@@ -429 +429 @@
   for ( i= 0; i <= max; i++ )
   {
-    omFreeSize( (ADDRESS) points[i]->point, fdim * sizeof(Coord_t) );
-    omFreeSize( (ADDRESS) points[i], sizeof(onePoint) );
-  }
-  omFreeSize( (ADDRESS) points, (max+1) * sizeof(onePointP) );
+    omFreeSize( (void *) points[i]->point, fdim * sizeof(Coord_t) );
+    omFreeSize( (void *) points[i], sizeof(onePoint) );
+  }
+  omFreeSize( (void *) points, (max+1) * sizeof(onePointP) );
 }
 
@@ -573 +573 @@
     pIter( piter );
   }
-  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(int) );
+  omFreeSize( (void *) vert, (dim+1) * sizeof(int) );
 }
 
@@ -591 +591 @@
     if ( j > dim ) break;
   }
-  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(int) );
+  omFreeSize( (void *) vert, (dim+1) * sizeof(int) );
 
   if ( i > num ) return 0;
@@ -712 +712 @@
   lifted= true;
 
-  if ( !outerL ) omFreeSize( (ADDRESS) l, (dim+1) * sizeof(int) );
+  if ( !outerL ) omFreeSize( (void *) l, (dim+1) * sizeof(int) );
 }
 //<-
@@ -811 +811 @@
   } // i
 
-  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(int) );
+  omFreeSize( (void *) vert, (idelem+1) * sizeof(int) );
 
 #ifdef mprDEBUG_PROT
@@ -875 +875 @@
   } // i
 
-  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(int) );
+  omFreeSize( (void *) vert, (idelem+1) * sizeof(int) );
 
 #ifdef mprDEBUG_PROT
@@ -1399 +1399 @@
 
   // clean up
-  omFreeSize( (ADDRESS) optSum, (LP->m) * sizeof(struct setID) );
+  omFreeSize( (void *) optSum, (LP->m) * sizeof(struct setID) );
 
   mprSTICKYPROT(ST_SPARSE_RC);
@@ -1479 +1479 @@
 
   pDelete( &epp );
-  omFreeSize( (ADDRESS) epp_mon, (n+2) * sizeof(int) );
-  omFreeSize( (ADDRESS) eexp, (pVariables+1)*sizeof(int));
+  omFreeSize( (void *) epp_mon, (n+2) * sizeof(int) );
+  omFreeSize( (void *) eexp, (pVariables+1)*sizeof(int));
 
 #ifdef mprDEBUG_ALL
@@ -1542 +1542 @@
   }
 
-  omFreeSize( (ADDRESS) vert.point, (pVariables+2) * sizeof(Coord_t) );
+  omFreeSize( (void *) vert.point, (pVariables+2) * sizeof(Coord_t) );
 
   return vs;
@@ -1717 +1717 @@
     delete Qi[i];
   }
-  omFreeSize( (ADDRESS) Qi, idelem * sizeof(pointSet*) );
+  omFreeSize( (void *) Qi, idelem * sizeof(pointSet*) );
 
   delete E;
@@ -2097 +2097 @@
     }
     // OB: ????? (solve_s.tst)
-    omfreeSize( (ADDRESS)resVectorList[i].numColVector,
+    omfreeSize( (void *)resVectorList[i].numColVector,
                 numVectors * sizeof( number ) );
-    omfreeSize( (ADDRESS)resVectorList[i].numColParNr,
+    omfreeSize( (void *)resVectorList[i].numColParNr,
                 (pVariables+1) * sizeof(int) );
   }
 
-  omFreeSize( (ADDRESS)resVectorList, veclistmax*sizeof( resVector ) );
+  omFreeSize( (void *)resVectorList, veclistmax*sizeof( resVector ) );
 
   // free matrix m
@@ -3055 +3055 @@
   // free some stuff: pev, presult
   for ( i=0; i < n; i++ ) nDelete( pev + i );
-  omFreeSize( (ADDRESS)pev, n * sizeof( number ) );
+  omFreeSize( (void *)pev, n * sizeof( number ) );
 
   for ( i=0; i <= tdg; i++ ) nDelete( presults+i );
-  omFreeSize( (ADDRESS)presults, (tdg + 1) * sizeof( number ) );
+  omFreeSize( (void *)presults, (tdg + 1) * sizeof( number ) );
 
   return roots;
@@ -3172 +3172 @@
   // free some stuff: pev, presult
   for ( i=0; i < n; i++ ) nDelete( pevpoint + i );
-  omFreeSize( (ADDRESS)pevpoint, n * sizeof( number ) );
+  omFreeSize( (void *)pevpoint, n * sizeof( number ) );
 
   return roots;