[gmpy-commits] CVS: gmpy/src gmpy.c,1.17,1.18

[Alex M. <al...@us...>]

Update of /cvsroot/gmpy/gmpy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3476/src

Modified Files:
	gmpy.c 
Log Message:
Remove occasional warning on comparisons of mpq (and mpf too).


Index: gmpy.c
===================================================================
RCS file: /cvsroot/gmpy/gmpy/src/gmpy.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gmpy.c	11 Nov 2005 21:52:23 -0000	1.17
--- gmpy.c	26 Feb 2006 06:44:19 -0000	1.18
***************
*** 116,119 ****
--- 116,122 ----
   *   NOT tested on GMP 3 (have none left around...), ONLY on GMP 4.*
   *
+  *   1.02:
+  *   fix warning in comparison of mpq's
+  *
   */
  #include "pymemcompat.h"
***************
*** 3970,3977 ****
  
  /* COMPARING */
! static int
! Pympz_cmp(PympzObject *a, PympzObject *b)
  {
-     int result = mpz_cmp(a->z, b->z);
      if(result) {
         if(result>0) {
--- 3973,3978 ----
  
  /* COMPARING */
! static int _normi(int result)
  {
      if(result) {
         if(result>0) {
***************
*** 3985,3996 ****
  }
  static int
  Pympq_cmp(PympqObject *a, PympqObject *b)
  {
!     return mpq_cmp(a->q, b->q);
  }
  static int
  Pympf_cmp(PympfObject *a, PympfObject *b)
  {
!     return mpf_cmp(a->f, b->f);
  }
  
--- 3986,4002 ----
  }
  static int
+ Pympz_cmp(PympzObject *a, PympzObject *b)
+ {
+     return _normi(mpz_cmp(a->z, b->z));
+ }
+ static int
  Pympq_cmp(PympqObject *a, PympqObject *b)
  {
!     return _normi(mpq_cmp(a->q, b->q));
  }
  static int
  Pympf_cmp(PympfObject *a, PympfObject *b)
  {
!     return _normi(mpf_cmp(a->f, b->f));
  }