Mercurial > octave

comparison 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
comparison
equal deleted inserted replaced
21941:1d23b75cbcd1 21942:aab79a1885cc
1642 if (octave::math::isinf (a) || octave::math::isinf (b)) 1642 if (octave::math::isinf (a) || octave::math::isinf (b))
1643 { 1643 {
1644 wrap = true; 1644 wrap = true;
1645 for (i = 0; i < nivals + 1; i++) 1645 for (i = 0; i < nivals + 1; i++)
1646 if (octave::math::isinf (iivals[i])) 1646 if (octave::math::isinf (iivals[i]))
1647 iivals[i] = gnulib::copysign (1.0, iivals[i]); 1647 iivals[i] = std::copysign (1.0, iivals[i]);
1648 else 1648 else
1649 iivals[i] = 2.0 * atan (iivals[i]) / M_PI; 1649 iivals[i] = 2.0 * atan (iivals[i]) / M_PI;
1650 } 1650 }
1651 1651
1652 // Initialize the heaps. 1652 // Initialize the heaps.
1980 // Check for divergence. 1980 // Check for divergence.
1981 ivl->ndiv = iv->ndiv + (fabs (iv->c[0]) > 0 1981 ivl->ndiv = iv->ndiv + (fabs (iv->c[0]) > 0
1982 && ivl->c[0] / iv->c[0] > 2); 1982 && ivl->c[0] / iv->c[0] > 2);
1983 if (ivl->ndiv > ndiv_max && 2 * ivl->ndiv > ivl->rdepth) 1983 if (ivl->ndiv > ndiv_max && 2 * ivl->ndiv > ivl->rdepth)
1984 { 1984 {
1985 igral = gnulib::copysign (octave::numeric_limits<double>::Inf (), igral); 1985 igral = std::copysign (octave::numeric_limits<double>::Inf (), igral);
1986 warning ("quadcc: divergent integral detected"); 1986 warning ("quadcc: divergent integral detected");
1987 break; 1987 break;
1988 } 1988 }
1989 1989
1990 // Compute the local integral. 1990 // Compute the local integral.
2071 // Check for divergence. 2071 // Check for divergence.
2072 ivr->ndiv = iv->ndiv + (fabs (iv->c[0]) > 0 2072 ivr->ndiv = iv->ndiv + (fabs (iv->c[0]) > 0
2073 && ivr->c[0] / iv->c[0] > 2); 2073 && ivr->c[0] / iv->c[0] > 2);
2074 if (ivr->ndiv > ndiv_max && 2 * ivr->ndiv > ivr->rdepth) 2074 if (ivr->ndiv > ndiv_max && 2 * ivr->ndiv > ivr->rdepth)
2075 { 2075 {
2076 igral = gnulib::copysign (octave::numeric_limits<double>::Inf (), igral); 2076 igral = std::copysign (octave::numeric_limits<double>::Inf (), igral);
2077 warning ("quadcc: divergent integral detected"); 2077 warning ("quadcc: divergent integral detected");
2078 break; 2078 break;
2079 } 2079 }
2080 2080
2081 // Compute the local integral. 2081 // Compute the local integral.