Changeset 1b74f3 in git

Timestamp:

Jun 14, 2011, 3:49:47 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

5374da00927c8d678e52de0d30e440c1ba6459f4

Parents:

f773274cbe208b555ecdb96d8a2075cec9025877

Message:

compiler warnings

git-svn-id: file:///usr/local/Singular/svn/trunk@14278 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• fast_mult.cc (modified) (2 diffs)
• kbuckets.cc (modified) (2 diffs)
• longtrans.cc (modified) (6 diffs)
• mpr_base.cc (modified) (15 diffs)
• mpr_numeric.cc (modified) (2 diffs)
• ringgb.cc (modified) (1 diff)

kernel/fast_mult.cc

@@ -456 +456 @@
 {
   number x;
-  int i;
   poly res = p_Init(r,lm_bin);
 
@@ -519 +518 @@
 
   }
-  int pseudo_len=1;
   zw=erg;
-  //  kBucket_Add_q(erg_bucket,erg,&pseudo_len);
 }
 

kernel/kbuckets.cc

@@ -819 +819 @@
   kbTest(bucket);
   i = pLogLength(l1);
+  #ifdef USE_COEF_BUCKETS
   number n=n_Init(1,r);
+  #endif
   if (i <= bucket->buckets_used && bucket->buckets[i] != NULL)
   {
@@ -1248 +1250 @@
   assume(bucket->buckets[i]!=NULL);
 
-  ring r=bucket->bucket_ring;
   poly p=bucket->buckets[i];
   bucket->buckets_length[i]--;
 #ifdef USE_COEF_BUCKETS
+  ring r=bucket->bucket_ring;
   if (bucket->coef[i]!=NULL)
   {

kernel/longtrans.cc

@@ -246 +246 @@
 {
   napoly y, r, qa, qn, q;
-  number t, h;
+  number t;
 
   if (p_GetExp(x, 1, nacRing) >= p_GetExp(c, 1, nacRing))
@@ -461 +461 @@
 const char* napHandlePars(const char *s, int i, napoly ex)
 {
-  int j;
   if (strcmp(s, ntParNames[i]) == 0)
   {
@@ -879 +878 @@
 napoly napPerm(napoly p,const int *par_perm,const ring src_ring,const nMapFunc nMap)
 {
-  napoly w, a;
+  napoly w;
 
   if (p==NULL) return NULL;
@@ -1705 +1704 @@
 {
   lnumber a = (lnumber)za;
-  napoly x, y;
   number t;
   if (a==NULL) return FALSE;
@@ -1763 +1761 @@
 {
   lnumber a = (lnumber)za;
-  napoly x, y;
-  number t;
   if (a==NULL) return FALSE;
 #ifdef LDEBUG
@@ -1972 +1968 @@
   napoly x = p->z;
   napoly y = p->n;
-
-  BOOLEAN norm=FALSE;
 
   if (y==NULL) return;

kernel/mpr_base.cc

@@ -647 +647 @@
 void pointSet::sort()
 {
-  int i,j;
+  int i;
   bool found= true;
   onePointP tmp;
@@ -722 +722 @@
   assume( i > 0 );
   poly iter= p;
-  for ( int j= 1; (j < i) && iter; j++ ) iter= pIter(iter);
+  for ( int j= 1; (j < i) && (iter!=NULL); j++ ) iter= pIter(iter);
   return iter;
 }
@@ -838 +838 @@
   int idelem= IDELEMS(gls);
   ideal id;
-  poly p,pid,pd;
+  poly p,pid;
   int * vert;
 
@@ -1241 +1241 @@
   bool found= true;
   mprfloat cd;
-  int set,pnt,onum;
+  int onum;
   int bucket[MAXVARS+2];
   setID *optSum;
@@ -1414 +1414 @@
   //    uRPos[i][2..idelem]: col of u(1) .. u(n)
   //    i= 1 .. numSet0
-  int i,j,epos;
+  int i,epos;
   int rp,cp;
   poly rowp,epp;
@@ -1503 +1503 @@
   int i,j;
   i= 1;
-  time_t *tp = NULL;
 
   while ( i <= dim )
@@ -1575 +1574 @@
   pointSet **Qi; // vertices sets of Conv(Supp(f_i)), i=0..idelem
   pointSet *E;   // all integer lattice points of the minkowski sum of Q0...Qn
-  int i,j,k;
+  int i,k;
   int pnt;
   int totverts;                // total number of exponent vectors in ideal gls
@@ -1735 +1734 @@
 const ideal resMatrixSparse::getMatrix()
 {
-  int i,j,rp,cp;
+  int i,j,cp;
   poly pp,phelp,piter,pgls;
 
@@ -1796 +1795 @@
 const number resMatrixSparse::getDetAt( const number* evpoint )
 {
-  int i,cp,rp;
+  int i,cp;
   poly pp,phelp,piter;
 
@@ -1856 +1855 @@
 const poly resMatrixSparse::getUDet( const number* evpoint )
 {
-  int i,cp,rp;
+  int i,cp;
   poly pp,phelp,piter;
 
@@ -2467 +2466 @@
 const ideal resMatrixDense::getMatrix()
 {
-  int k,i,j;
+  int i,j;
 
   // copy matrix
@@ -2548 +2547 @@
 const number resMatrixDense::getDetAt( const number* evpoint )
 {
-  int k,i,j;
+  int k,i;
 
   // copy evaluation point into matrix
@@ -2749 +2748 @@
 poly uResultant::linearPoly( const resMatType rrmt )
 {
-  int i,j;
+  int i;
 
   poly newlp= pOne();
@@ -2928 +2927 @@
 rootContainer ** uResultant::interpolateDenseSP( BOOLEAN matchUp, const number subDetVal )
 {
-  int i,j,p,uvar;
+  int i,p,uvar;
   long tdg;
   int loops= (matchUp?n-2:n-1);
@@ -3066 +3065 @@
 rootContainer ** uResultant::specializeInU( BOOLEAN matchUp, const number subDetVal )
 {
-  int i,j,p,uvar;
+  int i,p,uvar;
   long tdg;
   poly pures,piter;

kernel/mpr_numeric.cc

@@ -102 +102 @@
   int j;
   long i,c,sum;
-  number tmp;
 
   poly pnew,pit=NULL;
@@ -286 +285 @@
 {
   int i;
-  int n= pVariables;
-
   // free coeffs, ievpoint
   if ( ievpoint != NULL )

kernel/ringgb.cc

@@ -172 +172 @@
 {
   number cf = nCopy(pGetCoeff(f)), cg = nCopy(pGetCoeff(g));
-  int ct = ksCheckCoeff(&cf, &cg); // gcd and zero divisors
+  (void)ksCheckCoeff(&cf, &cg); // gcd and zero divisors
   poly fm, gm;
   k_GetLeadTerms(f, g, currRing, fm, gm, currRing);