Changeset 9836f6 in git

Timestamp:

Jun 6, 2017, 11:55:00 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e91901dce5fba3ac4ddf2c91c8a0a1f1f6da2843

Parents:

7b530596c04e94674670d6f56ce78eef6131916c

Message:

minor reformulation in factory

Location:

factory

Files:

• cf_chinese.cc (modified) (1 diff)
• gfops.cc (modified) (1 diff)
• imm.h (modified) (2 diffs)

factory/cf_chinese.cc

@@ -264 +264 @@
 void chineseRemainderCached(CFArray &a, CFArray &n, CanonicalForm &xnew, CanonicalForm &prod, CFArray &inv)
 {
-  CanonicalForm p, sum = 0; prod=1;
+  CanonicalForm p, sum(0L); prod(1L);
   int i;
   int len=n.size();

factory/gfops.cc

@@ -54 +54 @@
 unsigned short * gf_table = 0;
 
-CanonicalForm gf_mipo(0);
+CanonicalForm gf_mipo(0L);
 
 static CanonicalForm intVec2CF ( int degree, int * coeffs, int level )

factory/imm.h

@@ -64 +64 @@
 #if 1
 
-inline long imm2int ( const InternalCF * const imm )
+static inline long imm2int ( const InternalCF * const imm )
 {
     return ((intptr_t)imm) >> 2;
 }
 
-inline InternalCF * int2imm ( long i )
+static inline InternalCF * int2imm ( long i )
 {
     return (InternalCF*)((i << 2) | INTMARK );
@@ -76 +76 @@
 #else
 
-inline int imm2int ( const InternalCF * const imm )
+static inline long imm2int ( const InternalCF * const imm )
 {
     // this could be better done by masking the sign bit
-    if ( ((int)((intptr_t)imm)) < 0 )
-        return -((-(intptr_t)imm) >> 2);
-    else
-        return (intptr_t)imm >> 2;
-}
-
-inline InternalCF * int2imm ( long i )
+    if ( ((long)(intptr_t)imm)) < 0 )
+        return -((-(long)(intptr_t)imm) >> 2);
+    else
+        return (long)(intptr_t)imm >> 2;
+}
+
+static inline InternalCF * int2imm ( long i )
 {
     if ( i < 0 )