[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit aa3a9af30e49fbe992493737ebb5029856580019
Author: Martin Lee <martinlee84 at web.de>
Date:   Tue Mar 20 11:46:00 2012 +0100

    fix: seperate char= 0 and char>p

diff --git a/factory/facMul.cc b/factory/facMul.cc
index 2cbee1f..7ff5704 100644
--- a/factory/facMul.cc
+++ b/factory/facMul.cc
@@ -397,7 +397,7 @@ mulNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
 {
   if (CFFactory::gettype() == GaloisFieldDomain)
     return F*G;
-  if (F.inCoeffDomain() || G.inCoeffDomain() || getCharacteristic() == 0)
+  if (getCharacteristic() == 0)
   {
     Variable alpha;
     if ((!F.inCoeffDomain() && !G.inCoeffDomain()) &&
@@ -494,6 +494,8 @@ mulNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
     }
     return F*G;
   }
+  else if (F.inCoeffDomain() || G.inCoeffDomain())
+    return F*G;
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
   zz_p::init (getCharacteristic());

-- 
an open source computer algebra system