Changeset 1c7953 in git for kernel

Timestamp:

Sep 13, 2007, 4:17:08 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

01a57be60f163f44715ff7f3812b07c7ae891a78

Parents:

65bed3e3b194419dbe07eddc61d688cab60323cd

Message:

*hannes: 64bit adaption


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

File:

• kernel/ffields.cc (modified) (4 diffs)

kernel/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.6 2007-07-31 15:32:32 Singular Exp $ */
+/* $Id: ffields.cc,v 1.7 2007-09-13 14:17:08 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -146 +146 @@
 #endif
   if (((long)a == (long)nfCharQ) || ((long)b == (long)nfCharQ))
-    return (number)nfCharQ;
+    return (number)(long)nfCharQ;
   /*else*/
   int i=(int)((long)a+(long)b);
   if (i>=nfCharQ1) i-=nfCharQ1;
 #ifdef LDEBUG
-  nfTest((number)i);
-#endif
-  return (number)i;
+  nfTest((number)(long)i);
+#endif
+  return (number)(long)i;
 }
 
@@ -163 +163 @@
   // Hmm .. this is just to prevent initialization
   // from nfInitChar to go into an infinite loop
-  if (i==0) return (number)nfCharQ;
+  if (i==0) return (number)(long)nfCharQ;
   while (i <  0)    i += nfCharP;
   while (i >= nfCharP) i -= nfCharP;
-  if (i==0) return (number)nfCharQ;
+  if (i==0) return (number)(long)nfCharQ;
   CARDINAL c=0;
   while (i>1)
@@ -174 +174 @@
   }
 #ifdef LDEBUG
-  nfTest((number)c);
-#endif
-  return (number)c;
+  nfTest((number)(long)c);
+#endif
+  return (number)(long)c;
 }