Changeset 9bee53 in git


Ignore:
Timestamp:
Nov 14, 2013, 4:12:49 PM (9 years ago)
Author:
Yue Ren <ren@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
fa167e9991d970432d089c5d6b7094886d1ffbb7
Parents:
7395dd26103d1edd6fc4505722010d2bba012d96
git-author:
Yue Ren <ren@mathematik.uni-kl.de>2013-11-14 16:12:49+01:00
git-committer:
Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:02+01:00
Message:
fix: wrong comment on errors in n_Div for Z
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/coeffs.h

    r7395dd r9bee53  
    218218   // unbound name of the special element.
    219219   const char *  (*cfRead)(const char * s, number * a, const coeffs r);
    220 
    221220   void    (*cfNormalize)(number &a, const coeffs r);
    222 
    223221   BOOLEAN (*cfGreater)(number a,number b, const coeffs r),
    224222            /// tests
     
    544542/// conversion of n to an int; 0 if not possible
    545543/// in Z/pZ: the representing int lying in (-p/2 .. p/2]
    546 static FORCE_INLINE long n_Int(number &n,       const coeffs r)
     544static FORCE_INLINE int n_Int(number &n,       const coeffs r)
    547545{ STATISTIC(n_Int); assume(r != NULL); assume(r->cfInt!=NULL); return r->cfInt(n,r); }
    548546
     
    610608/// return the quotient of 'a' and 'b', i.e., a/b;
    611609/// raise an error if 'b' is not invertible in r
     610<<<<<<< HEAD
     611=======
     612/// exception in Z: raises an error if 'a' is not divisible by 'b'
     613>>>>>>> fix: wrong comment on errors in n_Div for Z
    612614static FORCE_INLINE number n_Div(number a, number b, const coeffs r)
    613615{ STATISTIC(n_Div); assume(r != NULL); assume(r->cfDiv!=NULL); return r->cfDiv(a,b,r); }
     
    660662 return sum;
    661663}
    662 
    663664
    664665/// return the difference of 'a' and 'b', i.e., a-b
Note: See TracChangeset for help on using the changeset viewer.