Mercurial > octave
changeset 11237:110e570e5f8d
keep gnulib out of lo-mappers.h
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 11 Nov 2010 02:26:37 -0500 |
| parents | 6ccf1130f23c |
| children | 1783b360976f |
| files | liboctave/ChangeLog liboctave/lo-mappers.cc liboctave/lo-mappers.h |
| diffstat | 3 files changed, 39 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Wed Nov 10 22:39:27 2010 -0500 +++ b/liboctave/ChangeLog Thu Nov 11 02:26:37 2010 -0500 @@ -1,3 +1,8 @@ +2010-11-11 John W. Eaton <jwe@octave.org> + + * lo-mappers.cc (xtrunc, xround): Move definitions here from + lo-mappers.h. + 2010-11-10 John W. Eaton <jwe@octave.org> * kpse-xfns.c: Delete.
--- a/liboctave/lo-mappers.cc Wed Nov 10 22:39:27 2010 -0500 +++ b/liboctave/lo-mappers.cc Thu Nov 11 02:26:37 2010 -0500 @@ -40,6 +40,21 @@ // double -> double mappers. +// Both xtrunc and xround belong here so we can keep gnulib:: out of +// lo-mappers.h. + +double +xtrunc (double x) +{ + return gnulib::trunc (x); +} + +double +xround (double x) +{ + return gnulib::round (x); +} + double xroundb (double x) { @@ -239,6 +254,21 @@ // float -> float mappers. +// Both xtrunc and xround belong here so we can keep gnulib:: out of +// lo-mappers.h. + +float +xtrunc (float x) +{ + return gnulib::truncf (x); +} + +float +xround (float x) +{ + return gnulib::round (x); +} + float xroundb (float x) {
--- a/liboctave/lo-mappers.h Wed Nov 10 22:39:27 2010 -0500 +++ b/liboctave/lo-mappers.h Thu Nov 11 02:26:37 2010 -0500 @@ -31,17 +31,16 @@ #include "lo-math.h" // Double Precision -inline double xtrunc (double x) { return gnulib::trunc (x); } +extern OCTAVE_API double xtrunc (double x); inline double xcopysign (double x, double y) { return copysignf (x, y); } inline double xceil (double x) { return ceil (x); } inline double xfloor (double x) { return floor (x); } - inline double arg (double x) { return atan2 (0.0, x); } inline double conj (double x) { return x; } inline double fix (double x) { return xtrunc (x); } inline double imag (double) { return 0.0; } inline double real (double x) { return x; } -inline double xround (double x) { return gnulib::round (x); } +extern OCTAVE_API double xround (double x); extern OCTAVE_API double xroundb (double x); extern OCTAVE_API double signum (double x); extern OCTAVE_API double xlog2 (double x); @@ -118,17 +117,16 @@ extern OCTAVE_API Complex xmax (const Complex& x, const Complex& y); // Single Precision -inline float xtrunc (float x) { return gnulib::truncf (x); } +extern OCTAVE_API float xtrunc (float x); inline float xcopysign (float x, float y) { return copysignf (x, y); } inline float xceil (float x) { return ceilf (x); } inline float xfloor (float x) { return floorf (x); } - inline float arg (float x) { return atan2f (0.0f, x); } inline float conj (float x) { return x; } inline float fix (float x) { return xtrunc (x); } inline float imag (float) { return 0.0f; } inline float real (float x) { return x; } -inline float xround (float x) { return gnulib::round (x); } +extern OCTAVE_API float xround (float x); extern OCTAVE_API float xroundb (float x); extern OCTAVE_API float signum (float x); extern OCTAVE_API float xlog2 (float x);