Changeset 3b77086 in git

Timestamp:

Jul 8, 2011, 12:13:33 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e5af4b5bc5ff4018e9936109bc818b9e21ec2920

Parents:

13f4949d39b811d9e4ba8e8cbff2c4565ce87187

Message:

freebsd port

git-svn-id: file:///usr/local/Singular/svn/trunk@14330 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

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

factory/cf_chinese.cc

@@ -208 +208 @@
             bool lessZero= (sign (NTLc) == -1);
             if (lessZero)
-              negate (NTLc, NTLc);
+              NTL::negate (NTLc, NTLc);
             ZZ NTLq= convertFacCF2NTLZZ (q);
             ZZ bound;
@@ -216 +216 @@
             {
               if (lessZero)
-                negate (NTLnum, NTLnum);
+                NTL::negate (NTLnum, NTLnum);
               CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
               CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));

factory/cf_factor.cc

@@ -464 +464 @@
             }
           }
-        #ifndef NTL_ZZ
-        if (fac_NTL_char >NTL_SP_BOUND)
-        {
+          #ifndef NTL_ZZ
+          if (fac_NTL_char >NTL_SP_BOUND)
+          {
             // convert to NTL
             ZZ_pX f1=convertFacCF2NTLZZpX(f);
@@ -507 +507 @@
           //test_cff(F,f);
         }
-        else
+        else /*getCharacteristic()==2*/
         {
           // Specialcase characteristic==2