Changeset 82db91a in git

Timestamp:

Oct 13, 2011, 9:27:11 PM (11 years ago)

Author:

Niels Ranosch <ranosch@…>

Branches:

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

Children:

c770dca4360b7797649175eadf26f907f8c1a70c

Parents:

a4b94909b4b3ff8277ebb757e522561d66ee7d17

git-author:

Niels Ranosch <ranosch@mfo.de>2011-10-13 21:27:11+02:00

git-committer:

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

Message:

FIX: function-macros should act as functions even if "empty", esp. in if-then block.

Location:

factory

Files:

• cf_cyclo.cc (modified) (1 diff)
• fac_univar.cc (modified) (1 diff)
• sm_sparsemod.cc (modified) (1 diff)

factory/cf_cyclo.cc

@@ -85 +85 @@
   if (j >= 31397)
     fail= true;
-  ASSERT (j < 31397, "integer factorizer ran out of primes") //sic
+  ASSERT (j < 31397, "integer factorizer ran out of primes"); //sic
   return result;
 }

factory/fac_univar.cc

@@ -303 +303 @@
         e = f - g * h;
         modulus = power( CanonicalForm(p), kvals[j] );
-        if ( mod( f - g * h, modulus ) != 0 )
+        if ( mod( f - g * h, modulus ) != 0 ) {
             DEBOUTLN( cerr, "error at lift stage " << i );
+        }
         i++;
     }

factory/sm_sparsemod.cc

@@ -409 +409 @@
   primig = MM(C[2]);
 
-  if ( level( primif) != level( primig ) )
-    ASSERT( 0, "this should n e v e r happen !!!!" );
+  ASSERT((level(primif) != level(primig)),
+         "this should n e v e r happen !!!!");
 
   //cout << " primif = " << primif << endl;