Eliminated calls to the obsolete 'mpfr_set_str_raw' in the tests

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@31 211d60ee-9f03-0410-a15a-8952a2c7a4e4

3 files changed, 7 insertions, 12 deletions

diff --git a/mpc-impl.h b/mpc-impl.h
index b2809b0..719d91c 100644
--- a/mpc-impl.h
+++ b/mpc-impl.h
@@ -31,13 +31,11 @@ MA 02111-1307, USA. */
 	  Change_sign
    + 2.0.2 / 2.0.3:
           Format.
-	  set_str_raw
 	  ceil_log2
 	  IS_ZERO
 	  Change_sign
    + 2.1.0: 
           Format 
-	  set_str_raw
 	  ceil_log2
 	  IS_ZERO
 	  Change_sign
@@ -69,7 +67,6 @@ typedef unsigned int            mp_size_unsigned_t;
 #else
 typedef unsigned long int       mp_size_unsigned_t;
 #endif
-#define mpfr_set_str_raw(x, s) mpfr_set_str(x,s,2,GMP_RNDN)
 #define MPFR_CMP_ABS mpfr_cmp_abs
 #define MPFR_PREC(x) ((x)->_mpfr_prec)
 #define MPFR_SIZE(x) ((x)->_mpfr_size)
@@ -81,7 +78,6 @@ typedef unsigned long int       mp_size_unsigned_t;
 
 #elif (MPFR_VERSION == MPFR_VERSION_NUM(2,1,0)) /* MPFR 2.1.0 */
 
-#define mpfr_set_str_raw(x, s) mpfr_set_str(x,s,2,GMP_RNDN)
 #define MPFR_CMP_ABS mpfr_cmp_abs
 #define MPFR_PREC(x) ((x)->_mpfr_prec)
 #define MPFR_EXP(x) ((x)->_mpfr_exp)
@@ -95,7 +91,6 @@ typedef unsigned long int       mp_size_unsigned_t;
 
 #else /* Generic MPFR code */
 
-#define mpfr_set_str_raw(x, s) mpfr_set_str(x,s,2,GMP_RNDN)
 #define MPFR_CMP_ABS mpfr_cmp_abs
 #define MPFR_PREC(x) mpfr_get_prec(x)
 #define MPFR_EXP(x)  mpfr_get_exp(x)
diff --git a/tmul.c b/tmul.c
index d35c5f0..1a98155 100644
--- a/tmul.c
+++ b/tmul.c
@@ -340,10 +340,10 @@ special ()
 
   mpc_set_prec (x, 27);
   mpc_set_prec (y, 27);
-  mpfr_set_str_raw (MPC_RE(x), "1.11111011011000010101000000e-2");
-  mpfr_set_str_raw (MPC_IM(x), "1.11010001010110111001110001e-3");
-  mpfr_set_str_raw (MPC_RE(y), "1.10100101110110011011100100e-1");
-  mpfr_set_str_raw (MPC_IM(y), "1.10111100011000001100110011e-1");
+  mpfr_set_str (MPC_RE(x), "1.11111011011000010101000000e-2", 2, GMP_RNDN);
+  mpfr_set_str (MPC_IM(x), "1.11010001010110111001110001e-3", 2, GMP_RNDN);
+  mpfr_set_str (MPC_RE(y), "1.10100101110110011011100100e-1", 2, GMP_RNDN);
+  mpfr_set_str (MPC_IM(y), "1.10111100011000001100110011e-1", 2, GMP_RNDN);
   cmpmul (x, y, 0);
 
   mpc_clear (x);
diff --git a/tsqr.c b/tsqr.c
index 3773818..470680e 100644
--- a/tsqr.c
+++ b/tsqr.c
@@ -1,6 +1,6 @@
 /* tsqr -- test file for mpc_sqr.
 
-Copyright (C) 2002 Andreas Enge, Paul Zimmermann
+Copyright (C) 2002, 2005 Andreas Enge, Paul Zimmermann
 
 This file is part of the MPC Library.
 
@@ -168,8 +168,8 @@ special ()
     }
 
   mpc_set_prec (x, 27);
-  mpfr_set_str_raw (MPC_RE(x), "1.11111011011000010101000000e-2");
-  mpfr_set_str_raw (MPC_IM(x), "1.11010001010110111001110001e-3");
+  mpfr_set_str (MPC_RE(x), "1.11111011011000010101000000e-2", 2, GMP_RNDN);
+  mpfr_set_str (MPC_IM(x), "1.11010001010110111001110001e-3", 2, GMP_RNDN);
 
   cmpsqr (x, 0);