Mercurial > octave

diff libinterp/corefcn/quadcc.cc @ 21942:aab79a1885cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
limit gnulib headers to liboctave/wrappers directory * libinterp/module.mk, liboctave/module.mk, src/module.mk, libgui/src/module.mk: Don't include libgnu directory in lists of include directories. * c-file-ptr-stream.cc, data.cc, dirfns.cc, file-io.cc, ft-text-renderer.cc, gcd.cc, gl2ps-print.cc, graphics.cc, mex.cc, oct-fstrm.cc, oct-procbuf.cc, oct-tex-lexer.in.ll, oct-tex-parser.in.yy, pr-output.cc, quadcc.cc, rand.cc, toplev.cc, utils.cc, __delaunayn__.cc, __init_fltk__.cc, __voronoi__.cc, convhulln.cc, ov-cell.cc, ov-float.cc, ov-scalar.cc, lex.ll, oct-parse.in.yy, Range.cc, idx-vector.cc, Faddeeva/Faddeeva.cc, lo-mappers.cc, lo-specfun.cc, randgamma.cc, randmtzig.cc, randpoisson.cc, dir-ops.cc, file-ops.cc, file-stat.cc, oct-env.cc, oct-syscalls.cc, oct-time.cc, oct-uname.cc, cmd-edit.cc, cmd-hist.cc, lo-utils.cc, oct-inttypes.cc, oct-shlib.cc, sparse-util.cc, mkoctfile.in.cc: Use std:: instead of gnulib:: namespace. * oct-conf-post.in.h: Don't define GNULIB_NAMESPACE.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Jun 2016 13:45:04 -0400
parents 2aef506f3fec
children 112b20240c87
line wrap: on
line diff
--- a/libinterp/corefcn/quadcc.cc	Fri Jun 17 11:00:11 2016 -0400
+++ b/libinterp/corefcn/quadcc.cc	Fri Jun 17 13:45:04 2016 -0400
@@ -1644,7 +1644,7 @@
       wrap = true;
       for (i = 0; i < nivals + 1; i++)
         if (octave::math::isinf (iivals[i]))
-          iivals[i] = gnulib::copysign (1.0, iivals[i]);
+          iivals[i] = std::copysign (1.0, iivals[i]);
         else
           iivals[i] = 2.0 * atan (iivals[i]) / M_PI;
     }
@@ -1982,7 +1982,7 @@
                                   && ivl->c[0] / iv->c[0] > 2);
           if (ivl->ndiv > ndiv_max && 2 * ivl->ndiv > ivl->rdepth)
             {
-              igral = gnulib::copysign (octave::numeric_limits<double>::Inf (), igral);
+              igral = std::copysign (octave::numeric_limits<double>::Inf (), igral);
               warning ("quadcc: divergent integral detected");
               break;
             }
@@ -2073,7 +2073,7 @@
                                   && ivr->c[0] / iv->c[0] > 2);
           if (ivr->ndiv > ndiv_max && 2 * ivr->ndiv > ivr->rdepth)
             {
-              igral = gnulib::copysign (octave::numeric_limits<double>::Inf (), igral);
+              igral = std::copysign (octave::numeric_limits<double>::Inf (), igral);
               warning ("quadcc: divergent integral detected");
               break;
             }