=================================================================== RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/tests/Attic/convert.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -p -r1.1.1.1 -r1.1.1.2 --- OpenXM_contrib/gmp/mpz/tests/Attic/convert.c 2000/01/10 15:35:28 1.1.1.1 +++ OpenXM_contrib/gmp/mpz/tests/Attic/convert.c 2000/09/09 14:13:00 1.1.1.2 @@ -1,20 +1,20 @@ /* Test conversion using mpz_get_str and mpz_set_str. -Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1996, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU MP Library. The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. The GNU MP Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -You should have received a copy of the GNU Library General Public License +You should have received a copy of the GNU Lesser General Public License along with the GNU MP Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -34,7 +34,7 @@ main (argc, argv) int argc; char **argv; { - MP_INT op1, op2; + mpz_t op1, op2; mp_size_t size; int i; int reps = 100000; @@ -44,26 +44,26 @@ main (argc, argv) if (argc == 2) reps = atoi (argv[1]); - mpz_init (&op1); - mpz_init (&op2); + mpz_init (op1); + mpz_init (op2); for (i = 0; i < reps; i++) { size = urandom () % SIZE - SIZE/2; - mpz_random2 (&op1, size); + mpz_random2 (op1, size); base = urandom () % 36 + 1; if (base == 1) base = 0; - str = mpz_get_str ((char *) 0, base, &op1); - mpz_set_str (&op2, str, base); - free (str); + str = mpz_get_str ((char *) 0, base, op1); + mpz_set_str (op2, str, base); + (*_mp_free_func) (str, 0); - if (mpz_cmp (&op1, &op2)) + if (mpz_cmp (op1, op2)) { fprintf (stderr, "ERROR\n"); - fprintf (stderr, "op1 = "); debug_mp (&op1, -16); + fprintf (stderr, "op1 = "); debug_mp (op1, -16); fprintf (stderr, "base = %d\n", base); abort (); } @@ -74,7 +74,7 @@ main (argc, argv) void debug_mp (x, base) - MP_INT *x; + mpz_t x; { mpz_out_str (stderr, base, x); fputc ('\n', stderr); }