Changeset 755296 in git

Timestamp:

Feb 28, 2020, 2:30:53 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f3f5266081df80b1fe68e322c350488db24adf59

Parents:

b3d4943f507c84f3286a9da17cd0a8e84a5abbc0

Message:

compiler warnings

File:

• libpolys/coeffs/modulop.h (modified) (5 diffs)

libpolys/coeffs/modulop.h

@@ -117 +117 @@
 {
   unsigned long R = (unsigned long)a + (unsigned long)b;
-  return (number)(R >= r->ch ? R - r->ch : R);
+  return (number)(R >= (unsigned long)r->ch ? R - (unsigned long)r->ch : R);
 }
 static inline void npInpAddM(number &a, number b, const coeffs r)
 {
   unsigned long R = (unsigned long)a + (unsigned long)b;
-  a=(number)(R >= r->ch ? R - r->ch : R);
+  a=(number)(R >= (unsigned long)r->ch ? R - (unsigned long)r->ch : R);
 }
 static inline number npSubM(number a, number b, const coeffs r)
@@ -132 +132 @@
 static inline number npAddM(number a, number b, const coeffs r)
 {
-   unsigned long res = (long)((unsigned long)a + (unsigned long)b);
+   unsigned long res = ((unsigned long)a + (unsigned long)b);
    res -= r->ch;
 #if SIZEOF_LONG == 8
@@ -143 +143 @@
 static inline void npInpAddM(number &a, number b, const coeffs r)
 {
-   unsigned long res = (long)((unsigned long)a + (unsigned long)b);
+   unsigned long res = ((unsigned long)a + (unsigned long)b);
    res -= r->ch;
 #if SIZEOF_LONG == 8
@@ -180 +180 @@
 static inline long npInvMod(long a, const coeffs R)
 {
-   long s, t;
-
-   long  u, v, u0, v0, u1, u2, q, r;
+   long s;
+
+   long  u, v, u0, u1, u2, q, r;
 
    assume(a>0);
@@ -255 +255 @@
 // The folloing is reused inside tgb*.cc
 number  npMult        (number a, number b, const coeffs r);
-// The following is currently used in OPAE.cc, OPAEQ.cc and OPAEp.cc for setting their SetMap...
-nMapFunc npSetMap(const coeffs src, const coeffs dst); // FIXME! BUG?
 
 #define npEqualM(A,B,r)  ((A)==(B))