Changeset 65

Show
Ignore:
Timestamp:
06/05/08 14:57:01 (6 months ago)
Author:
pernet
Message:

Fix bug

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • include/fflas-ffpack/fflas_bounds.inl

    r62 r65  
    1010 
    1111#ifdef _LINBOX_LINBOX_CONFIG_H 
    12 #define FFLAS_INT_TYPE LinBox::Integer 
     12#define FFLAS_INT_TYPE Integer 
    1313#else 
    1414#define FFLAS_INT_TYPE long unsigned int 
    … …  
    142142        size_t w = 0; 
    143143        size_t mt = m; 
    144         while (mt >= WINOTHRESHOLD) {w++; mt >> 1;} 
     144        while (mt >= WINOTHRESHOLD) {w++; mt >>= 1;} 
    145145        return w; 
    146146} 
    … …  
    284284        unsigned long long p = (pi + 1) / 2, p1 = 1; 
    285285        size_t nmax = 0; 
    286         unsigned long long max = ((1ULL << (DOUBLE_MANTISSA + 1)) / (pi - 1)); 
     286        unsigned long long max = ((1ULL << (DOUBLE_MANTISSA + 1)) / ((unsigned long long)(p - 1))); 
    287287        while (p1 < max){ 
    288288                p1 *= p; 
    … …  
    304304        unsigned long long p = (pi + 1) / 2, p1 = 1; 
    305305        size_t nmax = 0; 
    306         unsigned long long max = ((1ULL << (FLOAT_MANTISSA + 1)) / (pi - 1)); 
     306        unsigned long long max = ((1ULL << (FLOAT_MANTISSA + 1)) / ((unsigned long long) (pi - 1))); 
    307307        while (p1 < max){ 
    308308                p1 *= p;