Changeset 8d8fef in git for factory/facMul.cc

Timestamp:

Jul 29, 2019, 11:36:09 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

feed60bef09898f675e0f8605ed0ac0eaa8bed5a

Parents:

da1ec3de158a4f05384b9a83be86fc4c1942ec5fc1b9ababa50e8059dd847da0957f50aea901e6a8

Message:

Merge branch 'machine_learning' of github.com:MHeymann/Sources into machine_learning

File:

• factory/facMul.cc (modified) (8 diffs)

factory/facMul.cc

@@ -607 +607 @@
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
+#if (!defined(HAVE_FLINT) ||  __FLINT_RELEASE < 20400)
   if (fac_NTL_char != getCharacteristic())
   {
@@ -612 +613 @@
     zz_p::init (getCharacteristic());
   }
+#endif
   Variable alpha;
   CanonicalForm result;
@@ -788 +790 @@
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
+#if (!defined(HAVE_FLINT) ||  __FLINT_RELEASE < 20400)
   if (fac_NTL_char != getCharacteristic())
   {
@@ -793 +796 @@
     zz_p::init (getCharacteristic());
   }
+#endif
   Variable alpha;
   CanonicalForm result;
@@ -1049 +1053 @@
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
+#if (!defined(HAVE_FLINT) ||  __FLINT_RELEASE < 20400)
   if (fac_NTL_char != getCharacteristic())
   {
@@ -1054 +1059 @@
     zz_p::init (getCharacteristic());
   }
+#endif
   Variable alpha;
   CanonicalForm result;
@@ -3642 +3648 @@
   if (p > 0)
   {
+#if (!defined(HAVE_FLINT) ||  __FLINT_RELEASE < 20400)
     if (fac_NTL_char != p)
     {
@@ -3647 +3654 @@
       zz_p::init (p);
     }
+#endif
     Variable alpha;
     if (hasFirstAlgVar (A, alpha) || hasFirstAlgVar (B, alpha))