changeset 14151:e8bad0dc263c stable

quadcc: use gnulib::copysign * quadcc.cc: Don't provide definition of coypsign. (Fquadcc): Use gnulib::copysign.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Jan 2012 08:27:22 -0500
parents 87f06b9990bb
children 933bf1b4ab29
files src/DLD-FUNCTIONS/quadcc.cc
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/quadcc.cc	Thu Jan 05 17:34:30 2012 -0500
+++ b/src/DLD-FUNCTIONS/quadcc.cc	Fri Jan 06 08:27:22 2012 -0500
@@ -31,11 +31,6 @@
 #include "parse.h"
 #include "ov-fcn-handle.h"
 
-#if ! defined (HAVE_COPYSIGN) && defined (HAVE__COPYSIGN)
-#define copysign _copysign
-#define HAVE_COPYSIGN 1
-#endif
-
 /* Define the size of the interval heap. */
 #define cquad_heapsize                  200
 
@@ -1655,7 +1650,7 @@
       wrap = true;
       for (i = 0; i <= nivals; i++)
         if (xisinf (iivals[i]))
-          iivals[i] = copysign (1.0, iivals[i]);
+          iivals[i] = gnulib::copysign (1.0, iivals[i]);
         else
           iivals[i] = 2.0 * atan (iivals[i]) / M_PI;
     }
@@ -2020,7 +2015,7 @@
                                   && ivl->c[0] / iv->c[0] > 2);
           if (ivl->ndiv > ndiv_max && 2 * ivl->ndiv > ivl->rdepth)
             {
-              igral = copysign (octave_Inf, igral);
+              igral = gnulib::copysign (octave_Inf, igral);
               warning ("quadcc: divergent integral detected");
               break;
             }
@@ -2116,7 +2111,7 @@
                                   && ivr->c[0] / iv->c[0] > 2);
           if (ivr->ndiv > ndiv_max && 2 * ivr->ndiv > ivr->rdepth)
             {
-              igral = copysign (octave_Inf, igral);
+              igral = gnulib::copysign (octave_Inf, igral);
               warning ("quadcc: divergent integral detected");
               break;
             }