Mercurial > hg > octave-nkf
changeset 19821:9803fd881504 gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 23 Jan 2015 16:39:32 -0500 |
parents | 6b2d7a5dc62a (current diff) 200da7d24174 (diff) |
children | 05e3639b0fac 8ef79bc61d8a |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/cruft/Faddeeva/Faddeeva.cc +++ b/liboctave/cruft/Faddeeva/Faddeeva.cc @@ -1012,7 +1012,7 @@ compared to fitting the whole [0,1] interval with a single polynomial. */ static double erfcx_y100(double y100) { - switch ((int) y100) { + switch (static_cast<int> (y100)) { case 0: { double t = 2*y100 - 1; return 0.70878032454106438663e-3 + (0.71234091047026302958e-3 + (0.35779077297597742384e-5 + (0.17403143962587937815e-7 + (0.81710660047307788845e-10 + (0.36885022360434957634e-12 + 0.15917038551111111111e-14 * t) * t) * t) * t) * t) * t; @@ -1456,7 +1456,7 @@ the Chebyshev polynomials to be of significantly lower degree (about 1/30) compared to fitting the whole [0,1] interval with a single polynomial. */ static double w_im_y100(double y100, double x) { - switch ((int) y100) { + switch (static_cast<int> (y100)) { case 0: { double t = 2*y100 - 1; return 0.28351593328822191546e-2 + (0.28494783221378400759e-2 + (0.14427470563276734183e-4 + (0.10939723080231588129e-6 + (0.92474307943275042045e-9 + (0.89128907666450075245e-11 + 0.92974121935111111110e-13 * t) * t) * t) * t) * t) * t;