Changeset 7cb5590 in git

Timestamp:

Dec 20, 2011, 10:46:58 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

3ed6ccf09a1fdab770da99fa79111ab3bd8208e6

Parents:

ae3775b687b92e288f8dd89a3aee50987ac3ca37

git-author:

Martin Lee <martinlee84@web.de>2011-12-20 09:46:58+00:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00

Message:

fix: some preprocessor commands

Location:

factory

Files:

• cf_factor.cc (modified) (2 diffs)
• cf_gcd.cc (modified) (2 diffs)

factory/cf_factor.cc

@@ -441 +441 @@
       F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
       nmod_poly_factor_clear (result);
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
       if (isOn(SW_USE_NTL) && (isPurePoly(f)))
       {
@@ -540 +541 @@
       }
       else
-      #endif
+#endif //HAVE_NTL
+#endif //HAVE_FLINT
       {  // Use Factory without NTL
         if ( isOn( SW_BERLEKAMP ) )

factory/cf_gcd.cc

@@ -554 +554 @@
         if (bpure && (CFFactory::gettype() != GaloisFieldDomain))
           return gcd_univar_flintp(pi,pi1)*C;
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
+#endif
 #endif
     }
@@ -630 +632 @@
         if (isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_flint0(pi, pi1 ) * C;
-#else ifdef HAVE_NTL
+#else
+#ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
+#endif
 #endif
         return gcd_poly_univar0( pi, pi1, true ) * C;