Changeset 1daf0d in git for factory

Timestamp:

Jul 7, 2012, 3:14:28 PM (12 years ago)

Author:

Adrian Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2616026dd2a4a8abd18adedb6f3d10e41ace78ea

Parents:

800704ab0a248cdefe0f3e65b42f1c867ef4db6a

git-author:

Adrian Popescu <adi_popescum@yahoo.de>2012-07-07 15:14:28+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-18 22:09:31+01:00

Message:

64bits

Conflicts:

	factory/facBivar.h
	factory/facFqFactorize.h
	kernel/clapsing.cc

File:

• factory/int_rat.cc (modified) (3 diffs)

factory/int_rat.cc

@@ -13 +13 @@
 #include "gmpext.h"
 
-static int intgcd( int a, int b )
+static long intgcd( long a, long b )
 {
     if ( a < 0 ) a = -a;
     if ( b < 0 ) b = -b;
 
-    int c;
+    long c;
 
     while ( b != 0 )
@@ -29 +29 @@
 }
 
-static long intgcd( long a, long b )
-{
-    if ( a < 0 ) a = -a;
-    if ( b < 0 ) b = -b;
-
-    long c;
-
-    while ( b != 0 )
-    {
-        c = a % b;
-        a = b;
-        b = c;
-    }
-    return a;
-}
-
 
 InternalRational::InternalRational()
@@ -68 +52 @@
     else
     {
-        int g = intgcd( n, d );
+        long g = intgcd( (long) n, (long) d );
         if ( d < 0 )
         {
-          mpz_init_set_si( _num, -n / g );
-          mpz_init_set_si( _den, -d / g );
+          mpz_init_set_si( _num, -((long)n) / g );
+          mpz_init_set_si( _den, -((long)d) / g );
         }
         else