1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

get rid of a test failure with VC10.

* numeric.c (round_half_up, round_half_down): use `round` always because it's
  defined in this file even if doesn't exist.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-12-12 16:18:45 +00:00
parent e29f932c7b
commit e12265dae7

View file

@ -97,21 +97,13 @@ round_half_up(double x, double s)
{
double f, xs = x * s;
#ifdef HAVE_ROUND
f = round(xs);
if (s == 1.0) return f;
#endif
if (x > 0) {
#ifndef HAVE_ROUND
f = floor(xs);
#endif
if ((double)((f + 0.5) / s) <= x) f += 1;
x = f;
}
else {
#ifndef HAVE_ROUND
f = ceil(xs);
#endif
if ((double)((f - 0.5) / s) >= x) f -= 1;
x = f;
}
@ -123,20 +115,12 @@ round_half_down(double x, double s)
{
double f, xs = x * s;
#ifdef HAVE_ROUND
f = round(xs);
#endif
if (x > 0) {
#ifndef HAVE_ROUND
f = ceil(xs);
#endif
if ((double)((f - 0.5) / s) >= x) f -= 1;
x = f;
}
else {
#ifndef HAVE_ROUND
f = floor(xs);
#endif
if ((double)((f + 0.5) / s) <= x) f += 1;
x = f;
}