Changeset 6163af in git

Timestamp:

Jan 8, 2014, 11:44:02 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

87942fd98aaf19570db9520c70e619cdd51074aa

Parents:

19d0392ef4bad82b137011155ce948100d8693cf

git-author:

Martin Lee <martinlee84@web.de>2014-01-08 11:44:02+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:04+01:00

Message:

chg: disable functions if FLINT is around

File:

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

factory/facMul.cc

@@ -57 +57 @@
                 const Variable& alpha, const CanonicalForm& den)
 {
-
   CanonicalForm result= 0;
   int i= 0;
@@ -2216 +2215 @@
 #endif
 
+#ifndef HAVE_FLINT
 zz_pX kronSubFp (const CanonicalForm& A, int d)
 {
@@ -2245 +2245 @@
   return result;
 }
-
+#endif
+
+#if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
 zz_pEX kronSubFq (const CanonicalForm& A, int d, const Variable& alpha)
 {
@@ -2324 +2326 @@
   subA2.normalize();
 }
-
+#endif
+
+#ifndef HAVE_FLINT
 void
 kronSubReciproFp (zz_pX& subA1, zz_pX& subA2, const CanonicalForm& A, int d)
@@ -2357 +2361 @@
   subA2.normalize();
 }
-
+#endif
+
+#if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
 CanonicalForm
 reverseSubstReciproFq (const zz_pEX& F, const zz_pEX& G, int d, int k,
@@ -2469 +2475 @@
   return result;
 }
-
+#endif
+
+#ifndef HAVE_FLINT
 CanonicalForm
 reverseSubstReciproFp (const zz_pX& F, const zz_pX& G, int d, int k)
@@ -2581 +2589 @@
   return result;
 }
-
+#endif
+
+#if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
 CanonicalForm reverseSubstFq (const zz_pEX& F, int d, const Variable& alpha)
 {
@@ -2618 +2628 @@
   return result;
 }
-
+#endif
+
+#ifndef HAVE_FLINT
 CanonicalForm reverseSubstFp (const zz_pX& F, int d)
 {
@@ -2716 +2728 @@
   return A;
 }
-
+#endif
+
+#if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
 // assumes input to be reduced mod M and to be an element of Fq not Fp
 CanonicalForm
@@ -2748 +2762 @@
   return reverseSubstReciproFq (F1, F2, d1, d2, alpha);
 }
+#endif
 
 #ifdef HAVE_FLINT