Mercurial > octave
diff liboctave/lo-mappers.cc @ 10459:20ce1bea653d
use round and trunc from gnulib where possible
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 25 Mar 2010 11:45:10 +0100 |
| parents | 00219bdd2d17 |
| children | 4d1fc073fbb7 |
line wrap: on
line diff
--- a/liboctave/lo-mappers.cc Thu Mar 25 11:38:07 2010 +0100 +++ b/liboctave/lo-mappers.cc Thu Mar 25 11:45:10 2010 +0100 @@ -54,7 +54,7 @@ double fix (double x) { - return x > 0 ? floor (x) : ceil (x); + return gnulib::trunc (x); } double @@ -72,38 +72,13 @@ double xround (double x) { -#if defined (HAVE_ROUND) return gnulib::round (x); -#else - if (x >= 0) - { - double y = floor (x); - - if ((x - y) >= 0.5) - y += 1.0; - - return y; - } - else - { - double y = ceil (x); - - if ((y - x) >= 0.5) - y -= 1.0; - - return y; - } -#endif } double xtrunc (double x) { -#if defined (HAVE_TRUNC) - return trunc (x); -#else - return x > 0 ? floor (x) : ceil (x); -#endif + return gnulib::trunc (x); } double @@ -368,7 +343,7 @@ float fix (float x) { - return x > 0 ? floor (x) : ceil (x); + return gnulib::truncf (x); } float @@ -386,38 +361,13 @@ float xround (float x) { -#if defined (HAVE_ROUND) return gnulib::round (x); -#else - if (x >= 0) - { - float y = floor (x); - - if ((x - y) >= 0.5) - y += 1.0; - - return y; - } - else - { - float y = ceil (x); - - if ((y - x) >= 0.5) - y -= 1.0; - - return y; - } -#endif } float xtrunc (float x) { -#if defined (HAVE_TRUNC) - return trunc (x); -#else - return x > 0 ? floor (x) : ceil (x); -#endif + return gnulib::truncf (x); } float