[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 4c4bbc2bf8bf762776ee57501ef9aeafee362fb7
Author: Martin Lee <martinlee84 at web.de>
Date:   Tue Dec 20 09:46:58 2011 +0000

    fix: some preprocessor commands

diff --git a/factory/cf_factor.cc b/factory/cf_factor.cc
index cbb5abf..e2b813a 100644
--- a/factory/cf_factor.cc
+++ b/factory/cf_factor.cc
@@ -439,7 +439,8 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
       mp_limb_t leadingCoeff= nmod_poly_factor (result, f1);
       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)))
       {
         // USE NTL
@@ -538,7 +539,8 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
         }
       }
       else
-      #endif
+#endif //HAVE_NTL
+#endif //HAVE_FLINT
       {  // Use Factory without NTL
         if ( isOn( SW_BERLEKAMP ) )
           F=FpFactorizeUnivariateB( f, issqrfree );
diff --git a/factory/cf_gcd.cc b/factory/cf_gcd.cc
index 0b377c5..e5c1e30 100644
--- a/factory/cf_gcd.cc
+++ b/factory/cf_gcd.cc
@@ -552,10 +552,12 @@ gcd_poly_p( const CanonicalForm & f, const CanonicalForm & g )
 #ifdef HAVE_FLINT
         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
     }
     Variable v = f.mvar();
     Hi = power( LC( pi1, v ), delta );
@@ -628,10 +630,12 @@ gcd_poly_0( const CanonicalForm & f, const CanonicalForm & g )
 #ifdef HAVE_FLINT
         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;
     }
     else if ( gcd_test_one( pi1, pi, true ) )

-- 
an open source computer algebra system