Changeset 755296 in git


Ignore:
Timestamp:
Feb 28, 2020, 2:30:53 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
f3f5266081df80b1fe68e322c350488db24adf59
Parents:
b3d4943f507c84f3286a9da17cd0a8e84a5abbc0
Message:
compiler warnings
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/modulop.h

    rb3d494 r755296  
    117117{
    118118  unsigned long R = (unsigned long)a + (unsigned long)b;
    119   return (number)(R >= r->ch ? R - r->ch : R);
     119  return (number)(R >= (unsigned long)r->ch ? R - (unsigned long)r->ch : R);
    120120}
    121121static inline void npInpAddM(number &a, number b, const coeffs r)
    122122{
    123123  unsigned long R = (unsigned long)a + (unsigned long)b;
    124   a=(number)(R >= r->ch ? R - r->ch : R);
     124  a=(number)(R >= (unsigned long)r->ch ? R - (unsigned long)r->ch : R);
    125125}
    126126static inline number npSubM(number a, number b, const coeffs r)
     
    132132static inline number npAddM(number a, number b, const coeffs r)
    133133{
    134    unsigned long res = (long)((unsigned long)a + (unsigned long)b);
     134   unsigned long res = ((unsigned long)a + (unsigned long)b);
    135135   res -= r->ch;
    136136#if SIZEOF_LONG == 8
     
    143143static inline void npInpAddM(number &a, number b, const coeffs r)
    144144{
    145    unsigned long res = (long)((unsigned long)a + (unsigned long)b);
     145   unsigned long res = ((unsigned long)a + (unsigned long)b);
    146146   res -= r->ch;
    147147#if SIZEOF_LONG == 8
     
    180180static inline long npInvMod(long a, const coeffs R)
    181181{
    182    long s, t;
    183 
    184    long  u, v, u0, v0, u1, u2, q, r;
     182   long s;
     183
     184   long  u, v, u0, u1, u2, q, r;
    185185
    186186   assume(a>0);
     
    255255// The folloing is reused inside tgb*.cc
    256256number  npMult        (number a, number b, const coeffs r);
    257 // The following is currently used in OPAE.cc, OPAEQ.cc and OPAEp.cc for setting their SetMap...
    258 nMapFunc npSetMap(const coeffs src, const coeffs dst); // FIXME! BUG?
    259257
    260258#define npEqualM(A,B,r)  ((A)==(B))
Note: See TracChangeset for help on using the changeset viewer.