Changeset ac8e1a in git

Timestamp:

Jun 8, 2011, 3:20:17 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

3645fcced1ffa30007ffe55cd16d183a0a6256fe

Parents:

639652f186091509059ccc76f18852db93c1b988

Message:

compiler warnings


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

Location:

factory

Files:

• facFqBivar.cc (modified) (5 diffs)
• facFqFactorize.cc (modified) (3 diffs)
• facFqSquarefree.cc (modified) (1 diff)
• gfops.cc (modified) (1 diff)
• int_poly.cc (modified) (9 diffs)
• int_rat.cc (modified) (2 diffs)
• sm_sparsemod.cc (modified) (1 diff)

factory/facFqBivar.cc

@@ -267 +267 @@
   DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, M) == F " <<
             (LC (F, 1)*prodMod (factors, M) == F));
-  int degMipoBeta;
-  if (!k && beta.level() == 1)
-    degMipoBeta= 1;
-  else if (!k && beta.level() != 1)
+  int degMipoBeta= 1;
+  if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -703 +701 @@
   int d= degree (F) + degree (LCBuf);
   CFList source, dest;
-  int degMipoBeta;
-  if (!k && beta.level() == 1)
-    degMipoBeta= 1;
-  else if (!k && beta.level() != 1)
+  int degMipoBeta= 1;
+  if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
   for (CFListIterator i= factors; i.hasItem(); i++)
@@ -4604 +4600 @@
     gamma= rootOf (mipo);
     Variable V_buf;
-    bool fail;
+    bool fail= false;
     primElemAlpha= primitiveElement (alpha, V_buf, fail);
     imPrimElemAlpha= map (primElemAlpha, alpha, bufEvaluation, gamma);
@@ -5377 +5373 @@
   A= A (y + evaluation, y);
 
-  int liftBound= liftBound= degree (A, y) + 1 + degree (LC(A, x));
+  int liftBound= degree (A, y) + 1 + degree (LC(A, x));
 
   int boundsLength;
@@ -5394 +5390 @@
   DEBOUTLN (cerr, "uniFactors= " << uniFactors);
 
-  if (GF && !extension || (GF && extension && k != 1))
+  if ((GF && !extension) || (GF && extension && k != 1))
   {
     bool earlySuccess= false;

factory/facFqFactorize.cc

@@ -618 +618 @@
     return CFList();
 
-  int degMipoBeta;
-  if (!k && beta.level() == 1)
-    degMipoBeta= 1;
-  else if (!k && beta.level() != 1)
+  int degMipoBeta= 1;
+  if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -915 +913 @@
   int e= 0;
   int nBuf;
-  int degMipoBeta;
-  if (!k && beta.level() == 1)
-    degMipoBeta= 1;
-  else if (!k && beta.level() != 1)
+  int degMipoBeta= 1;
+  if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -1065 +1061 @@
   CFList source, dest;
 
-  int degMipoBeta;
-  if (!k && beta.level() == 1)
-    degMipoBeta= 1;
-  else if (!k && beta.level() != 1)
+  int degMipoBeta= 1;
+  if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 

factory/facFqSquarefree.cc

@@ -212 +212 @@
   CanonicalForm result;
   int i= 1;
-  bool GF= (CFFactory::gettype() == GaloisFieldDomain);
   bool allZero= true;
   for (; i <= A.level(); i++)

factory/gfops.cc

@@ -147 +147 @@
             bufptr += digs;
             if ( gf_table[i] == gf_q )
+            {
                 if ( i == gf_q1 )
                     gf_m1 = 0;
                 else
                     gf_m1 = i;
+            }
             i++; k++;
         }

factory/int_poly.cc

@@ -353 +353 @@
         resultFirst = reduceTermList( resultFirst, (getInternalMipo( var ))->firstTerm, resultLast );
         if ( resultFirst == 0 )
+        {
             if ( getRefCount() <= 1 )
             {
@@ -363 +364 @@
                 return CFFactory::basic(0);
             }
+        }
         else  if ( resultFirst->exp == 0 )
+        {
             if ( getRefCount() <= 1 )
             {
@@ -378 +381 @@
                 return res;
             }
+        }
     }
     if ( getRefCount() <= 1 )
@@ -730 +734 @@
             // test on inequaltiy in general is cheaper
             if ( (cursor1->exp != cursor2->exp) || (cursor1->coeff != cursor2->coeff) )
+            {
                 if ( cursor1->exp > cursor2->exp )
                     return 1;
@@ -738 +743 @@
                 else
                     return -1;
+             }
         // check trailing terms
         if ( cursor1 == cursor2 )
@@ -965 +971 @@
     }
     if ( invert )
+    {
         if ( getRefCount() <= 1 )
         {
@@ -975 +982 @@
             return CFFactory::basic( 0 );
         }
+    }
     if ( c.isOne() )
         return this;
@@ -1039 +1047 @@
     }
     if ( invert )
+    {
         if ( getRefCount() <= 1 )
         {
@@ -1049 +1058 @@
             return CFFactory::basic( 0 );
         }
+    }
     if ( c.isOne() )
         return this;

factory/int_rat.cc

@@ -557 +557 @@
         int cc = imm2int( c );
         if ( cc == 0 )
+        {
             if ( negate )
             {
@@ -575 +576 @@
             else
                 return this;
+        }
         mpz_init( &n );
         if ( cc < 0 )

factory/sm_sparsemod.cc

@@ -53 +53 @@
     return gcd( icontent( u ), v);
   else if ( u.isUnivariate() )
+  {
     if ( v.isUnivariate() )
       return gcd( u, v );
     else
       return gcd( v, u );
+  }
 
   //   u und v Polynome in levU - Variablen x1, ..., xlevU